Index: lisp/cus-edit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.305
diff -c -r1.305 cus-edit.el
*** lisp/cus-edit.el	22 Sep 2006 21:47:00 -0000	1.305
--- lisp/cus-edit.el	26 Sep 2006 19:24:10 -0000
***************
*** 4157,4162 ****
--- 4157,4164 ----
  				    recentf-exclude)))
  	 (old-buffer (find-buffer-visiting filename)))
      (with-current-buffer (or old-buffer (find-file-noselect filename))
+       (unless (eq major-mode 'emacs-lisp-mode)
+ 	(emacs-lisp-mode))
        (let ((inhibit-read-only t))
  	(custom-save-variables)
  	(custom-save-faces))
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10121
diff -c -0 -r1.10121 ChangeLog
*** lisp/ChangeLog	24 Sep 2006 13:48:59 -0000	1.10121
--- lisp/ChangeLog	26 Sep 2006 19:24:40 -0000
***************
*** 0 ****
--- 1,5 ----
+ 2006-09-26  Michaël Cadilhac  <michael.cadilhac@lrde.org>
+ 
+ 	* cus-edit.el (custom-save-all): Switch to emacs-lisp mode before
+ 	saving anything to be sure that `forward-sexp' behaves correctly.
+