*** empty log message ***

[bpt/emacs.git] / lisp / options.el

diff --git a/lisp/options.el b/lisp/options.el
index 26036c3..3697de1 100644 (file)
--- a/lisp/options.el
+++ b/lisp/options.el
@@ -17,8 +17,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -28,15 +29,14 @@
 ;; mode specifically for editing option values.  Do `M-x describe-mode' in
 ;; that context for more details.
 
+;; The customization buffer feature is intended to make this obsolete.
+
 ;;; Code:
 
 ;;;###autoload
 (defun list-options ()
   "Display a list of Emacs user options, with values and documentation."
   (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)
@@ -45,25 +45,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*"))
@@ -138,4 +141,6 @@ For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph]
      (kill-sexp 1)
      (prin1 (symbol-value var) (current-buffer)))))
 
+(provide 'options)
+
 ;;; options.el ends here