From db0777b7bd146e207b69e2236d8c19833f2c43fb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 19 Jun 2016 18:05:55 -0700 Subject: [PATCH 01/13] * admin/authors.el (authors-aliases, authors-fixed-case): Additions. --- admin/authors.el | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/admin/authors.el b/admin/authors.el index 1447bd4f49a..0fdfe72e8af 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -45,7 +45,9 @@ files.") '( (nil "A\\. N\\. Other") ; unknown author 2014-12-03, later removed ("Aaron S. Hawley" "Aaron Hawley") + ("Alan Third" "Alan J Third") ("Alexandru Harsanyi" "Alex Harsanyi") + ("Álvar Jesús Ibeas Martín" "Álvar Ibeas") ("Andrew Csillag" "Drew Csillag") ("Anna M. Bigatti" "Anna Bigatti") ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." @@ -61,6 +63,7 @@ files.") ("David J. Biesack" "David Biesack") ("David De La Harpe Golden" "David Golden") ("David Gillespie" "Dave Gillespie") + ("David S. Goldberg" "Dave Goldberg") ("David Kågedal" "David K..edal") ("David M. Koppelman" "David Koppelman") ("David M. Smith" "David Smith" "David M Smith") @@ -72,6 +75,7 @@ files.") ("Eric M. Ludlam" "Eric Ludlam") ("Eric S. Raymond" "Eric Raymond") ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina") + ("Francis Litterio" "Fran Litterio") ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright") ("François Pinard" "Francois Pinard") ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`") @@ -122,11 +126,12 @@ files.") ("Michaël Cadilhac" "Michael Cadilhac") ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, p/BSG") ("Michael R. Cook" "Michael Cook") - ("Michael Sperber" "Michael Sperber \\[Mr. Preprocessor\\]") + ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr. Preprocessor\\]") ("Mikio Nakajima" "Nakajima Mikio") ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") ("Noorul Islam" "Noorul Islam K M") ;;; ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME? + ("Óscar Fuentes" "Oscar Fuentes") ("Paul Eggert" "Paul R\\. Eggert") ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik") ("Pavel Kobiakov" "Pavel Kobyakov") @@ -136,6 +141,7 @@ files.") ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith") ("Peter Runestig" "Peter 'luna' Runestig") ("Piotr Zieliński" "Piotr Zielinski") + ("Przemysław Wojnowski" "Przemyslaw Wojnowski") ("Rainer Schöpf" "Rainer Schoepf") ("Raja R. Harinath" "Raja R Harinath") ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski") @@ -143,13 +149,16 @@ files.") ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org") ("Robert J. Chassell" "Bob Chassell") ("Roberto Huelga Díaz" "Roberto Huelga") + ("Rodney J. Whitby" "Rod Whitby") ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts") + ("Ron Schnell" "Ronnie Schnell") ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}") ("Sacha Chua" "Sandra Jean Chua") ("Sam Steingold" "Sam Shteingold") ("Satyaki Das" "Indexed search by Satyaki Das") ("Sébastien Vauban" "Sebastien Vauban") ("Sergey Litvinov" "Litvinov Sergey") + ("Shun-ichi Goto" "Shun-ichi GOTO") ;; There are other Stefans. ;;; ("Stefan Monnier" "Stefan") ("Steven L. Baur" "SL Baur" "Steven L Baur") @@ -186,12 +195,14 @@ If REALNAME is nil, ignore that author.") ;; FIXME seems it would be less fragile to check for O', Mc, etc. (defconst authors-fixed-case '("Barry O'Reilly" + "Brian McKenna" "Brian van den Broek" "Bryan O'Sullivan" "Christian von Roques" "Christophe de Dinechin" "Craig McDaniel" "Daniel LaLiberte" + "Daniel McClanahan" "David J. MacKenzie" "David McCabe" "David O'Toole" @@ -222,6 +233,7 @@ If REALNAME is nil, ignore that author.") "Shun-ichi Goto" "Thomas DeWeese" "Tijs van Bakel" + "Titus von der Malsburg" "Yu-ji Hosokawa") "List of authors whose names cannot be simply capitalized.") From e5e886d12f3eff3102916c82a5aa82e0db714579 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 19 Jun 2016 18:25:19 -0700 Subject: [PATCH 02/13] * admin/authors.el (authors-ignored-files, authors-valid-file-names) (authors-renamed-files-alist): Additions. --- admin/authors.el | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/admin/authors.el b/admin/authors.el index 0fdfe72e8af..0738e2a8dd1 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -292,6 +292,7 @@ Changes to files matching one of the regexps in this list are not listed.") "gfdl.1" "texi/Makefile.in" "autodeps.mk" + "lwlib/autodeps.mk" "oldXMenu/autodeps.mk" "src/autodeps.mk" "Imakefile" "icons/sink.ico" "aixcc.lex" @@ -383,9 +384,11 @@ Changes to files matching one of the regexps in this list are not listed.") "lib/qset-acl.c" "lib/qcopy-acl.c" "lib/file-has-acl.c" ;; files from old MS Windows build procedures "makefile.w32-in" + "admin/unidata/makefile.w32-in" "unidata/makefile.w32-in" "lib/makefile.w32-in" "leim/makefile.w32-in" + "lisp/makefile.w32-in" "src/makefile.w32-in" "nt/emacs-src.tags" "doc/emacs/makefile.w32-in" @@ -704,8 +707,9 @@ Changes to files in this list are not listed.") "net/zone-mode.el" "xesam.el" "term/mac-win.el" "sup-mouse.el" "term/apollo.el" - "term/vt102.el" "term/vt125.el" "term/vt201.el" "term/vt220.el" "term/vt300.el" - "term/vt320.el" "term/vt400.el" "term/vt420.el" + "term/vt102.el" "term/vt125.el" "term/vt201.el" "term/vt220.el" + "term/vt240.el" "term/vt300.el" "term/vt320.el" "term/vt400.el" + "term/vt420.el" "url-https.el" "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el" "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el" @@ -750,6 +754,7 @@ Changes to files in this list are not listed.") "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c" "test-distrib.c" "testfile" "tpu-edt.doc" ; see below + "lisp/obsolete/vc-mcvs.el" ) "File names which are valid, but no longer exist (or cannot be found) in the repository.") @@ -841,11 +846,14 @@ in the repository.") ("emulation/crisp.el" . "crisp.el") ("emulation/tpu-edt.el" . "tpu-edt.el") ("emulation/tpu-extras.el" . "tpu-extras.el") + ("emulation/tpu-mapper.el" . "tpu-mapper.el") ("emulation/vi.el" . "vi.el") ("emulation/vip.el" . "vip.el") ("emulation/ws-mode.el" . "ws-mode.el") ("mail/mailpost.el" . "mailpost.el") + ("net/eudcb-ph.el" . "eudcb-ph.el") ("play/bruce.el" . "bruce.el") + ("lisp/play/landmark.el" . "landmark.el") ("play/yow.el" . "yow.el") ("patcomp.el" . "patcomp.el") ("emulation/ws-mode.el" . "ws-mode.el") @@ -926,6 +934,7 @@ in the repository.") ("grammars" . "grammars") ;; Moved from lisp/emacs-lisp/ to admin/. ("emacs-lisp/authors.el" . "authors.el") + ("emacs-lisp/find-gc.el" . "admin/find-gc.el") ;; From etc to lisp/cedet/semantic/. ("grammars/bovine-grammar.el" . "bovine/grammar.el") ("grammars/wisent-grammar.el" . "wisent/grammar.el") From 5f375723216bdf0519316db1d2acf464b80a708f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 20 Jun 2016 17:19:25 +0300 Subject: [PATCH 03/13] Fix removal of variables from process-environment * src/callproc.c (add_env): Fix comparison of a variable with a value against the same variable without a value. (Bug#23779) --- src/callproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/callproc.c b/src/callproc.c index db602f538c9..2fb5b1d5194 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1099,7 +1099,7 @@ add_env (char **env, char **new_env, char *string) char *p = *ep, *q = string; while (ok) { - if (*q != *p) + if (*p && *q != *p) break; if (*q == 0) /* The string is a lone variable name; keep it for now, we From 4793f5fc417ae687e609ba5591353a3a9185d635 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 21 Jun 2016 17:20:09 +0300 Subject: [PATCH 04/13] Clarify documentation of 'line-spacing' and 'line-height' * doc/lispref/display.texi (Line Height): Clarify how the line height is determined via variables and text properties. (Bug#23806) --- doc/lispref/display.texi | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 181bff09b55..0d0ec671f7c 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1996,15 +1996,17 @@ newline. If the property value is @code{t}, the newline character has no effect on the displayed height of the line---the visible contents -alone determine the height. This is useful for tiling small images -(or image slices) without adding blank areas between the images. +alone determine the height. The @code{line-spacing} property, +described below, is also ignored in this case. This is useful for +tiling small images (or image slices) without adding blank areas +between the images. If the property value is a list of the form @code{(@var{height} @var{total})}, that adds extra space @emph{below} the display line. First Emacs uses @var{height} as a height spec to control extra space @emph{above} the line; then it adds enough space @emph{below} the line -to bring the total line height up to @var{total}. In this case, the -other ways to specify the line spacing are ignored. +to bring the total line height up to @var{total}. In this case, any +value of @code{line-spacing} property for the newline is ignored. @cindex height spec Any other kind of property value is a height spec, which translates @@ -2054,9 +2056,10 @@ overrides line spacings specified for the frame. @kindex line-spacing @r{(text property)} Finally, a newline can have a @code{line-spacing} text or overlay -property that overrides the default frame line spacing and the buffer -local @code{line-spacing} variable, for the display line ending in -that newline. +property that can enlarge the default frame line spacing and the +buffer local @code{line-spacing} variable: if its value is larger than +the buffer or frame defaults, that larger value is used instead, for +the display line ending in that newline. One way or another, these mechanisms specify a Lisp value for the spacing of each line. The value is a height spec, and it translates From 6cdd8f7153b553c6dc02be47e04a2e75117b6fe4 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Mon, 20 Jun 2016 14:26:02 +0100 Subject: [PATCH 05/13] Ensure undo-boundary after insert-file-contents. * src/fileio.c: Record undoable change during insert-file-contents. Addresses Bug #23785. --- src/fileio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/fileio.c b/src/fileio.c index b11f9233ab4..746aac42a9c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4047,8 +4047,14 @@ by calling `format-decode', which see. */) being called in insert_from_buffer (via in prepare_to_modify_buffer). */ specbind (intern ("buffer-file-name"), Qnil); + + /* Temporarily enable the undo-buffer to ensure that the change + is marked as an undoable one. Bug #23785. */ + bset_undo_list(current_buffer,Qnil); insert_from_buffer (XBUFFER (conversion_buffer), same_at_start_charpos, inserted_chars, 0); + bset_undo_list(current_buffer,Qt); + /* Set `inserted' to the number of inserted characters. */ inserted = PT - temp; /* Set point before the inserted characters. */ From dc5e65b5deb2f5b67f6c3a06ae81c6b074bd4b56 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Wed, 22 Jun 2016 02:04:33 +0300 Subject: [PATCH 06/13] Unset GIT_DIR when calling Git commands * lisp/vc/vc-git.el (vc-git--call, vc-git-command): Unset GIT_DIR (bug#23769). --- lisp/vc/vc-git.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f35c84d50c5..9eac5b26f03 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1423,7 +1423,8 @@ The difference to vc-do-command is that this function always invokes (let ((coding-system-for-read (or coding-system-for-read vc-git-log-output-coding-system)) (coding-system-for-write - (or coding-system-for-write vc-git-commits-coding-system))) + (or coding-system-for-write vc-git-commits-coding-system)) + (process-environment (cons "GIT_DIR" process-environment))) (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program ;; http://debbugs.gnu.org/16897 (unless (and (not (cdr-safe file-or-list)) @@ -1451,6 +1452,7 @@ The difference to vc-do-command is that this function always invokes (coding-system-for-write (or coding-system-for-write vc-git-commits-coding-system)) (process-environment (cons "PAGER=" process-environment))) + (push "GIT_DIR" process-environment) (apply 'process-file vc-git-program nil buffer nil command args))) (defun vc-git--out-ok (command &rest args) From 829733104db073f8abd67765eae162e7360281fa Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Wed, 22 Jun 2016 09:42:49 +0100 Subject: [PATCH 07/13] ; Revert "Ensure undo-boundary after insert-file-contents." This reverts commit 6cdd8f7153b553c6dc02be47e04a2e75117b6fe4. The original commit did not address the problem it was claiming to. --- src/fileio.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index 746aac42a9c..b11f9233ab4 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4047,14 +4047,8 @@ by calling `format-decode', which see. */) being called in insert_from_buffer (via in prepare_to_modify_buffer). */ specbind (intern ("buffer-file-name"), Qnil); - - /* Temporarily enable the undo-buffer to ensure that the change - is marked as an undoable one. Bug #23785. */ - bset_undo_list(current_buffer,Qnil); insert_from_buffer (XBUFFER (conversion_buffer), same_at_start_charpos, inserted_chars, 0); - bset_undo_list(current_buffer,Qt); - /* Set `inserted' to the number of inserted characters. */ inserted = PT - temp; /* Set point before the inserted characters. */ From ea512a7c2cd30206dd509b193c9faaba25640180 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 22 Jun 2016 10:32:56 +0000 Subject: [PATCH 08/13] * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys that launch `widget-button-click' (bug#22157). --- lisp/gnus/mm-decode.el | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 3ea63c74034..bb8e2038d26 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1896,10 +1896,11 @@ If RECURSIVE, search recursively." (defvar shr-map) (autoload 'widget-convert-button "wid-edit") +(defvar widget-keymap) (defun mm-convert-shr-links () (let ((start (point-min)) - end) + end keymap) (while (and start (< start (point-max))) (when (setq start (text-property-not-all start (point-max) 'shr-url nil)) @@ -1907,9 +1908,16 @@ If RECURSIVE, search recursively." (widget-convert-button 'url-link start end :help-echo (get-text-property start 'help-echo) - :keymap shr-map + :keymap (setq keymap (copy-keymap shr-map)) (get-text-property start 'shr-url)) - (put-text-property start end 'local-map nil) + ;; Remove keymap that `shr-urlify' adds. + (put-text-property start end 'keymap nil) + ;; Mask keys that launch `widget-button-click'. + ;; Those bindings are provided by `widget-keymap' + ;; that is a parent of `gnus-article-mode-map'. + (dolist (key (where-is-internal #'widget-button-click widget-keymap)) + (unless (lookup-key keymap key) + (define-key keymap key #'ignore))) (dolist (overlay (overlays-at start)) (overlay-put overlay 'face nil)) (setq start end))))) From a98aa02a5dbf079f7b4f3be5487a2f2b741d103d Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Wed, 22 Jun 2016 21:20:06 +0300 Subject: [PATCH 09/13] Error on multibyte characters in HTTP request * lisp/url/url-http.el (url-http-create-request): Check the constructed request in the end to verify that it does not contain multibyte characters (bug#23750). --- lisp/url/url-http.el | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 5832e92c5a3..7156e6fa4ea 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -275,19 +275,7 @@ request.") ;; allows us to elide null lines directly, at the cost of making ;; the layout less clear. (setq request - ;; We used to concat directly, but if one of the strings happens - ;; to being multibyte (even if it only contains pure ASCII) then - ;; every string gets converted with `string-MAKE-multibyte' which - ;; turns the 127-255 codes into things like latin-1 accented chars - ;; (it would work right if it used `string-TO-multibyte' instead). - ;; So to avoid the problem we force every string to be unibyte. - (mapconcat - ;; FIXME: Instead of `string-AS-unibyte' we'd want - ;; `string-to-unibyte', so as to properly signal an error if one - ;; of the strings contains a multibyte char. - 'string-as-unibyte - (delq nil - (list + (concat ;; The request (or url-http-method "GET") " " (if using-proxy (url-recreate-url url-http-target-url) real-fname) @@ -365,7 +353,10 @@ request.") "\r\n" ;; Any data url-http-data)) - "")) + ;; Bug#23750 + (unless (= (string-bytes request) + (length request)) + (error "Multibyte text in HTTP request: %s" request)) (url-http-debug "Request is: \n%s" request) request)) From ab0ebb93a9c69f4a0cc475ed899f8cabb64852c0 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Wed, 22 Jun 2016 21:59:51 +0100 Subject: [PATCH 10/13] ; Only load .elc file in tests. * test/automated/viper-tests.el (viper-test-undo-kmacro): Ensure that empty load file ends with .elc extension. --- test/automated/viper-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/automated/viper-tests.el b/test/automated/viper-tests.el index 074dd637538..0d6095b2c92 100644 --- a/test/automated/viper-tests.el +++ b/test/automated/viper-tests.el @@ -38,7 +38,7 @@ after itself, although it will leave a buffer called ;; Select an expert-level for the same reason. (viper-expert-level 5) ;; viper loads this even with -q so make sure it's empty! - (viper-custom-file-name (make-temp-file "viper-tests")) + (viper-custom-file-name (make-temp-file "viper-tests" nil ".elc")) (before-buffer (current-buffer))) (unwind-protect (progn From 4395aaacd4195d3a5cca9df66cfea13380414a37 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 23 Jun 2016 18:09:14 +0300 Subject: [PATCH 11/13] Fix documentation of 'assoc-string' and 'compare-strings' * src/minibuf.c (Fassoc_string): Clarify how CASE-FOLD affects the string comparison. (Bug#23833) * src/fns.c (Fcompare_strings): Fix the description of how IGNORE-CASE affects the comparison. * doc/lispref/strings.texi (Text Comparison): Clarify how CASE-FOLD affects the string comparison in 'assoc-string'. Fix the description of how IGNORE-CASE affects the comparison in 'compare-strings'. --- doc/lispref/strings.texi | 5 +++-- src/fns.c | 2 +- src/minibuf.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index c6563f7e03c..ca700a29a95 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -660,7 +660,7 @@ The strings are compared by the numeric values of their characters. For instance, @var{str1} is considered less than @var{str2} if its first differing character has a smaller numeric value. If @var{ignore-case} is non-@code{nil}, characters are converted to -lower-case before comparing them. Unibyte strings are converted to +upper-case before comparing them. Unibyte strings are converted to multibyte for comparison (@pxref{Text Representations}), so that a unibyte string and its conversion to multibyte are always regarded as equal. @@ -677,7 +677,8 @@ specified portion) is less. This function works like @code{assoc}, except that @var{key} must be a string or symbol, and comparison is done using @code{compare-strings}. Symbols are converted to strings before testing. -If @var{case-fold} is non-@code{nil}, it ignores case differences. +If @var{case-fold} is non-@code{nil}, @var{key} and the elements of +@var{alist} are converted to upper-case before comparison. Unlike @code{assoc}, this function can also match elements of the alist that are strings or symbols rather than conses. In particular, @var{alist} can be a list of strings or symbols rather than an actual alist. diff --git a/src/fns.c b/src/fns.c index ef6055c17d1..1f1619300de 100644 --- a/src/fns.c +++ b/src/fns.c @@ -224,7 +224,7 @@ Like in `substring', negative values are counted from the end. The strings are compared by the numeric values of their characters. For instance, STR1 is "less than" STR2 if its first differing character has a smaller numeric value. If IGNORE-CASE is non-nil, -characters are converted to lower-case before comparing them. Unibyte +characters are converted to upper-case before comparing them. Unibyte strings are converted to multibyte for comparison. The value is t if the strings (or specified portions) match. diff --git a/src/minibuf.c b/src/minibuf.c index d85a7a9b103..3d34635c6c0 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1817,8 +1817,8 @@ DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0, This returns the first element of LIST whose car matches the string or symbol KEY, or nil if no match exists. When performing the comparison, symbols are first converted to strings, and unibyte -strings to multibyte. If the optional arg CASE-FOLD is non-nil, case -is ignored. +strings to multibyte. If the optional arg CASE-FOLD is non-nil, both +KEY and the elements of LIST are upcased for comparison. Unlike `assoc', KEY can also match an entry in LIST consisting of a single string, rather than a cons cell whose car is a string. */) From f2536958ec711b50a0cf8714defb921193ea8ae4 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 25 Jun 2016 13:12:11 -0400 Subject: [PATCH 12/13] Update docs for `customize-mode' * lisp/cus-edit.el (customize-mode): This function works with both major and minor modes, make docstring and prompt reflect that (Bug #23649). * doc/lispref/modes.texi (Derived Modes): Remove note about customize-mode being experimental; it has been around since Emacs 22 (Bug #11299). Co-authored-by: Drew Adams --- doc/lispref/modes.texi | 7 +++---- lisp/cus-edit.el | 11 ++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 4c96e63bd7b..32baa27147b 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -794,10 +794,9 @@ if @var{parent} is @code{nil}. (Again, a @code{nil} value is @item :group If this is specified, the value should be the customization group for -this mode. (Not all major modes have one.) Only the (still -experimental and unadvertised) command @code{customize-mode} currently -uses this. @code{define-derived-mode} does @emph{not} automatically -define the specified customization group. +this mode. (Not all major modes have one.) The command +@code{customize-mode} uses this. @code{define-derived-mode} does +@emph{not} automatically define the specified customization group. @end table Here is a hypothetical example: diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index d7db3530099..7826506cc46 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)))))))) From 0377fe2b819bb93ac7dc314c8dbd99304d8b98d0 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 26 Jun 2016 00:06:27 +0200 Subject: [PATCH 13/13] ; Spelling fixes --- etc/AUTHORS | 2 +- test/ChangeLog.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/AUTHORS b/etc/AUTHORS index 9a4aaf6d554..dc5a28eac4c 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -3682,7 +3682,7 @@ Prestoo Ten: changed screen.el Primoz Peterlin: changed TUTORIAL.sl -Przemyslaw Wojnowski: changed cl-lib-tests.el +Przemysław Wojnowski: changed cl-lib-tests.el Przemysław Wojnowski: wrote obarray-tests.el sgml-mode-tests.el and changed obarray.el sgml-mode.el diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index 3520f13df60..367ca74b7b9 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -79,7 +79,7 @@ * indent/js-indent-first-initialiser-dynamic.js: New tests for `js-indent-first-initialiser'. -2015-03-10 Przemyslaw Wojnowski +2015-03-10 Przemysław Wojnowski * automated/cl-lib-tests.el: Add tests for plusp, second, ... (cl-lib-test-plusp, cl-lib-test-minusp)