* cus-edit.el (custom-save-all): Switch to emacs-lisp mode before

	saving anything to be sure that `forward-sexp' behaves correctly.

1 files changed, 2 insertions, 0 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 82d2f147874..2f752c5fb66 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4157,6 +4157,8 @@ if only the first line of the docstring is shown."))
                                     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))