diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-26 00:16:25 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-26 00:16:25 +0200 |
| commit | fdcf46d33eebc59e56a35fcea186c61aad3c81d0 (patch) | |
| tree | 8db131d7f52ead80ee12e52c3236510f71b31b48 /lisp/cus-edit.el | |
| parent | d6930356cabd3036e445cc6a2f668b1fd3e0cde4 (diff) | |
| parent | 0377fe2b819bb93ac7dc314c8dbd99304d8b98d0 (diff) | |
| download | emacs-fdcf46d33eebc59e56a35fcea186c61aad3c81d0.tar.gz | |
Merge from origin/emacs-25
0377fe2 ; Spelling fixes
f253695 Update docs for `customize-mode'
4395aaa Fix documentation of 'assoc-string' and 'compare-strings'
ab0ebb9 ; Only load .elc file in tests.
a98aa02 Error on multibyte characters in HTTP request
ea512a7 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys th...
8297331 ; Revert "Ensure undo-boundary after insert-file-contents."
dc5e65b Unset GIT_DIR when calling Git commands
6cdd8f7 Ensure undo-boundary after insert-file-contents.
4793f5f Clarify documentation of 'line-spacing' and 'line-height'
5f37572 Fix removal of variables from process-environment
e5e886d * admin/authors.el (authors-ignored-files, authors-valid-file...
db0777b * admin/authors.el (authors-aliases, authors-fixed-case): Add...
# Conflicts:
# doc/lispref/modes.texi
# lisp/gnus/mm-decode.el
Diffstat (limited to 'lisp/cus-edit.el')
| -rw-r--r-- | lisp/cus-edit.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index a1eb1d20016..60d07f9bc77 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1072,9 +1072,10 @@ are shown; the contents of those subgroups are initially hidden." ;;;###autoload (defun customize-mode (mode) - "Customize options related to the current major mode. -If a prefix \\[universal-argument] was given (or if the current major mode has no known group), -then prompt for the MODE to customize." + "Customize options related to a major or minor mode. +By default the current major mode is used. With a prefix +argument or if the current major mode has no known group, prompt +for the MODE to customize." (interactive (list (let ((completion-regexp-list '("-mode\\'")) @@ -1083,8 +1084,8 @@ then prompt for the MODE to customize." major-mode (intern (completing-read (if group - (format "Major mode (default %s): " major-mode) - "Major mode: ") + (format "Mode (default %s): " major-mode) + "Mode: ") obarray 'custom-group-of-mode t nil nil (if group (symbol-name major-mode)))))))) |