Merge from emacs--devo--0

[gnu-emacs] / lisp / obsolete / options.el

diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 53a67516b2f41302190f8bd0fe4a6f9e76990ba4..5d4b0f6a63e9e6ccd3be65051244bb9393391d3c 100644 (file)
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -1,6 +1,7 @@
 ;;; options.el --- edit Options command for Emacs
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -8,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,8 +19,8 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -40,6 +41,8 @@ It is now better to use Customize instead."
   (interactive)
   (with-output-to-temp-buffer "*List Options*"
     (let (vars)
+      (princ "This facility is obsolete; we recommend using M-x customize instead.")
+
       (mapatoms (function (lambda (sym)
                            (if (user-variable-p sym)
                                (setq vars (cons sym vars))))))
@@ -109,7 +112,7 @@ For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph]
   (setq truncate-lines t)
   (setq major-mode 'Edit-options-mode)
   (setq mode-name "Options")
-  (run-hooks 'Edit-options-mode-hook))
+  (run-mode-hooks 'Edit-options-mode-hook))
 
 (defun Edit-options-set () (interactive)
   (Edit-options-modify
@@ -144,4 +147,5 @@ For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph]
 
 (provide 'options)
 
+;;; arch-tag: d18211a1-f3fb-48c9-a449-d5acde406a3c
 ;;; options.el ends here