(comment-indent): Be more careful when inserting

[gnu-emacs] / lisp / options.el

diff --git a/lisp/options.el b/lisp/options.el
index 413e41051711fa539cc200dcf408d46f21152f60..53a67516b2f41302190f8bd0fe4a6f9e76990ba4 100644 (file)
--- a/lisp/options.el
+++ b/lisp/options.el
@@ -1,4 +1,4 @@
-;;; options.el --- edit Options command for Emacs.
+;;; options.el --- edit Options command for Emacs
 
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
 
@@ -35,11 +35,9 @@
 
 ;;;###autoload
 (defun list-options ()
-  "Display a list of Emacs user options, with values and documentation."
+  "Display a list of Emacs user options, with values and documentation.
+It is now better to use Customize instead."
   (interactive)
-  (save-excursion
-    (set-buffer (get-buffer-create "*List Options*"))
-    (Edit-options-mode))
   (with-output-to-temp-buffer "*List Options*"
     (let (vars)
       (mapatoms (function (lambda (sym)
@@ -48,25 +46,28 @@
       (setq vars (sort vars 'string-lessp))
       (while vars
        (let ((sym (car vars)))
-         (princ ";; ")
-         (prin1 sym)
-         (princ ":\n\t")
-         (prin1 (symbol-value sym))
-         (terpri)
-         (princ (substitute-command-keys 
-                 (documentation-property sym 'variable-documentation)))
-         (princ "\n;;\n"))
-       (setq vars (cdr vars)))))
-  (save-excursion
-    (set-buffer "*List Options*")
-    (setq buffer-read-only t)))
+         (when (boundp sym)
+           (princ ";; ")
+           (prin1 sym)
+           (princ ":\n\t")
+           (prin1 (symbol-value sym))
+           (terpri)
+           (princ (substitute-command-keys
+                   (documentation-property sym 'variable-documentation)))
+           (princ "\n;;\n"))
+         (setq vars (cdr vars))))
+      (with-current-buffer "*List Options*"
+       (Edit-options-mode)
+       (setq buffer-read-only t)))))
 
 ;;;###autoload
 (defun edit-options ()
   "Edit a list of Emacs user option values.
 Selects a buffer containing such a list,
 in which there are commands to set the option values.
-Type \\[describe-mode] in that buffer for a list of commands."
+Type \\[describe-mode] in that buffer for a list of commands.
+
+The Custom feature is intended to make this obsolete."
   (interactive)
   (list-options)
   (pop-to-buffer "*List Options*"))
@@ -112,16 +113,16 @@ For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph]
 
 (defun Edit-options-set () (interactive)
   (Edit-options-modify
-   '(lambda (var) (eval-minibuffer (concat "New " (symbol-name var) ": ")))))
+   (lambda (var) (eval-minibuffer (concat "New " (symbol-name var) ": ")))))
 
 (defun Edit-options-toggle () (interactive)
-  (Edit-options-modify '(lambda (var) (not (symbol-value var)))))
+  (Edit-options-modify (lambda (var) (not (symbol-value var)))))
 
 (defun Edit-options-t () (interactive)
-  (Edit-options-modify '(lambda (var) t)))
+  (Edit-options-modify (lambda (var) t)))
 
 (defun Edit-options-nil () (interactive)
-  (Edit-options-modify '(lambda (var) nil)))
+  (Edit-options-modify (lambda (var) nil)))
 
 (defun Edit-options-modify (modfun)
   (save-excursion