2 files changed, 5 insertions, 140 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 49b755b5511..1264cc64ead 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -283,6 +283,10 @@ To restore the old behavior, use
 *** New connection method "owncloud", which allows to access OwnCloud
 or NextCloud hosted files and directories.
 
+---
+** The options.el library has been removed.
+It was obsolete since Emacs 22.1, replaced by customize.
+
 
 * New Modes and Packages in Emacs 27.1
 
@@ -317,6 +321,7 @@ as new-style, bind the new variable 'force-new-style-backquotes' to t.
 integer, Emacs now signals an error if the number is too large for the
 implementation to format (Bug#30408).
 
+---
 ** Some functions and variables obsolete since Emacs 22 have been removed:
 archive-mouse-extract, assoc-ignore-case, assoc-ignore-representation,
 backward-text-line, blink-cursor, bookmark-exit-hooks,
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
deleted file mode 100644
index 41637a6ecf3..00000000000
--- a/lisp/obsolete/options.el
+++ /dev/null
@@ -1,140 +0,0 @@
-;;; options.el --- edit Options command for Emacs
-
-;; Copyright (C) 1985, 2001-2018 Free Software Foundation, Inc.
-
-;; Maintainer: emacs-devel@gnu.org
-;; Obsolete-since: 22.1
-
-;; This file is part of GNU Emacs.
-
-;; 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 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This code provides functions to list and edit the values of all global
-;; option variables known to loaded Emacs Lisp code.  There are two entry
-;; points, `list-options' and `edit' options'.  The latter enters a major
-;; 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.
-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 (custom-variable-p sym)
-                                (setq vars (cons sym vars))))))
-      (setq vars (sort vars 'string-lessp))
-      (while vars
-        (let ((sym (car vars)))
-          (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.
-
-The Custom feature is intended to make this obsolete."
-  (interactive)
-  (list-options)
-  (pop-to-buffer "*List Options*"))
-
-(defvar Edit-options-mode-map
-  (let ((map (make-keymap)))
-    (define-key map "s" 'Edit-options-set)
-    (define-key map "x" 'Edit-options-toggle)
-    (define-key map "1" 'Edit-options-t)
-    (define-key map "0" 'Edit-options-nil)
-    (define-key map "p" 'backward-paragraph)
-    (define-key map " " 'forward-paragraph)
-    (define-key map "n" 'forward-paragraph)
-    map)
-  "")
-
-;; Edit Options mode is suitable only for specially formatted data.
-(put 'Edit-options-mode 'mode-class 'special)
-
-(define-derived-mode Edit-options-mode emacs-lisp-mode "Options"
-  "\\<Edit-options-mode-map>\
-Major mode for editing Emacs user option settings.
-Special commands are:
-\\[Edit-options-set] -- set variable point points at.  New value read using minibuffer.
-\\[Edit-options-toggle] -- toggle variable, t -> nil, nil -> t.
-\\[Edit-options-t] -- set variable to t.
-\\[Edit-options-nil] -- set variable to nil.
-Changed values made by these commands take effect immediately.
-
-Each variable description is a paragraph.
-For convenience, the characters \\[backward-paragraph] and \\[forward-paragraph] move back and forward by paragraphs."
-  (setq-local paragraph-separate "[^\^@-\^?]")
-  (setq-local paragraph-start "\t")
-  (setq-local truncate-lines t))
-
-(defun Edit-options-set () (interactive)
-  (Edit-options-modify
-   (lambda (var) (eval-minibuffer (concat "New " (symbol-name var) ": ")))))
-
-(defun Edit-options-toggle () (interactive)
-  (Edit-options-modify (lambda (var) (not (symbol-value var)))))
-
-(defun Edit-options-t () (interactive)
-  (Edit-options-modify (lambda (var) t)))
-
-(defun Edit-options-nil () (interactive)
-  (Edit-options-modify (lambda (var) nil)))
-
-(defun Edit-options-modify (modfun)
-  (save-excursion
-   (let ((buffer-read-only nil) var pos)
-     (re-search-backward "^;; \\|\\`")
-     (forward-char 3)
-     (setq pos (point))
-     (save-restriction
-       (narrow-to-region pos (progn (end-of-line) (1- (point))))
-       (goto-char pos)
-       (setq var (read (current-buffer))))
-     (goto-char pos)
-     (forward-line 1)
-     (forward-char 1)
-     (save-excursion
-       (set var (funcall modfun var)))
-     (kill-sexp 1)
-     (prin1 (symbol-value var) (current-buffer)))))
-
-(provide 'options)
-
-;;; options.el ends here