summaryrefslogtreecommitdiff
path: root/lisp/cus-edit.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cus-edit.el')
-rw-r--r--lisp/cus-edit.el44
1 files changed, 21 insertions, 23 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 72f00b2f959..f15161a600b 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -175,10 +175,16 @@
:group 'emacs)
(defgroup wp nil
- "Support for editing text files."
- :tag "Text"
+ "Support for editing text files.
+Use group `text' for this instead. This group is deprecated."
:group 'emacs)
+(defgroup text nil
+ "Support for editing text files."
+ :group 'emacs
+ ;; Inherit from deprecated `wp' for compatibility, for now.
+ :group 'wp)
+
(defgroup data nil
"Support for editing binary data files."
:group 'emacs)
@@ -197,14 +203,6 @@
:link '(custom-manual "(emacs)Emulation")
:group 'editing)
-(defgroup mouse nil
- "Mouse support."
- :group 'editing)
-
-(defgroup outlines nil
- "Support for hierarchical outlining."
- :group 'wp)
-
(defgroup external nil
"Interfacing to external utilities."
:group 'emacs)
@@ -317,7 +315,7 @@
(defgroup tex nil
"Code related to the TeX formatter."
:link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
- :group 'wp)
+ :group 'text)
(defgroup faces nil
"Support for multiple fonts."
@@ -406,10 +404,6 @@
"Input from the keyboard."
:group 'environment)
-(defgroup mouse nil
- "Input from the mouse."
- :group 'environment)
-
(defgroup menu nil
"Input from the menus."
:group 'environment)
@@ -1165,7 +1159,7 @@ Show the buffer in another window, but don't select it."
(unless (eq symbol basevar)
(message "`%s' is an alias for `%s'" symbol basevar))))
-(defvar customize-changed-options-previous-release "24.1"
+(defvar customize-changed-options-previous-release "24.5"
"Version for `customize-changed-options' to refer back to by default.")
;; Packages will update this variable, so make it available.
@@ -1545,27 +1539,29 @@ not for everybody."
buf))))
;;;###autoload
-(defun custom-buffer-create (options &optional name description)
+(defun custom-buffer-create (options &optional name _description)
"Create a buffer containing OPTIONS.
Optional NAME is the name of the buffer.
OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where
SYMBOL is a customization option, and WIDGET is a widget for editing
that option.
DESCRIPTION is unused."
- (pop-to-buffer-same-window (custom-get-fresh-buffer (or name "*Customization*")))
- (custom-buffer-create-internal options description))
+ (pop-to-buffer-same-window
+ (custom-get-fresh-buffer (or name "*Customization*")))
+ (custom-buffer-create-internal options))
;;;###autoload
-(defun custom-buffer-create-other-window (options &optional name description)
+(defun custom-buffer-create-other-window (options &optional name _description)
"Create a buffer containing OPTIONS, and display it in another window.
The result includes selecting that window.
Optional NAME is the name of the buffer.
OPTIONS should be an alist of the form ((SYMBOL WIDGET)...), where
SYMBOL is a customization option, and WIDGET is a widget for editing
-that option."
+that option.
+DESCRIPTION is unused."
(unless name (setq name "*Customization*"))
(switch-to-buffer-other-window (custom-get-fresh-buffer name))
- (custom-buffer-create-internal options description))
+ (custom-buffer-create-internal options))
(defcustom custom-reset-button-menu t
"If non-nil, only show a single reset button in customize buffers.
@@ -1623,7 +1619,9 @@ Otherwise use brackets."
;; Insert verbose help at the top of the custom buffer.
(when custom-buffer-verbose-help
(unless init-file
- (widget-insert "Custom settings cannot be saved; maybe you started Emacs with `-q'.\n"))
+ (widget-insert
+ (format-message
+ "Custom settings cannot be saved; maybe you started Emacs with `-q'.\n")))
(widget-insert "For help using this buffer, see ")
(widget-create 'custom-manual
:tag "Easy Customization"