From 8910fe1db06a8bf997930087025bbbabcc21741d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jul 2019 10:31:06 +0300 Subject: * src/fns.c (Fmapconcat): Doc fix. (Bug#36418) --- src/fns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fns.c b/src/fns.c index 2276a9971b2..97a505ecbef 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2496,7 +2496,7 @@ DEFUN ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0, In between each pair of results, stick in SEPARATOR. Thus, " " as SEPARATOR results in spaces between the values returned by FUNCTION. SEQUENCE may be a list, a vector, a bool-vector, or a string. -SEPARATOR must be a string. +SEPARATOR must be a string, a vector, or a list of characters. FUNCTION must be a function of one argument, and must return a value that is a sequence of characters: either a string, or a vector or list of numbers that are valid character codepoints. */) -- cgit v1.2.1 From d176090fc28ce3031213bc008919c1895f78d778 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jul 2019 11:30:35 +0300 Subject: Improve documentation of secondary selections * doc/emacs/killing.texi (Secondary Selection): Improve wording. Mention that 'M-mouse-1' can be used to cancel secondary selections. (Bug#36365) --- doc/emacs/killing.texi | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 9b9c890331e..670decd67bd 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -605,16 +605,20 @@ This command does not alter the kill ring. @kindex M-mouse-1 @item M-mouse-1 Set one endpoint for the @dfn{secondary selection} -(@code{mouse-start-secondary}). +(@code{mouse-start-secondary}). Use @kbd{M-mouse-3} to set the other +end and complete the selection. This command can also cancel any +existing secondary selection without starting a new one, if you click +@kbd{M-mouse-1} on the mode line or on the header line. @findex mouse-secondary-save-then-kill @kindex M-mouse-3 @item M-mouse-3 -Set the secondary selection, with one end at the position clicked and -the other at the position specified with @kbd{M-mouse-1} -(@code{mouse-secondary-save-then-kill}). This also puts the selected -text in the kill ring. A second @kbd{M-mouse-3} at the same place -kills the secondary selection just made. +Set the secondary selection (@code{mouse-secondary-save-then-kill}), +with one end at the position you click @kbd{M-mouse-3}, and the other +at the position specified previously with @kbd{M-mouse-1}. This also +puts the selected text in the kill ring. A second @kbd{M-mouse-3} at +the same place kills the text selected by the secondary selection just +made. @findex mouse-yank-secondary @kindex M-mouse-2 -- cgit v1.2.1 From 21351ccc0081167a6dc1b9e9327217c5efdb6827 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jul 2019 11:40:49 +0300 Subject: ; * src/lread.c (Fread): Make the comment wording more accurate. --- src/lread.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lread.c b/src/lread.c index b0eb29a2a1f..5c7bd3993d1 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2172,7 +2172,10 @@ STREAM or the value of `standard-input' may be: if (EQ (stream, Qt)) stream = Qread_char; if (EQ (stream, Qread_char)) - /* FIXME: ?! When is this used !? */ + /* FIXME: ?! This is used when the reader is called from the + minibuffer without a stream, as in (read). But is this feature + ever used, and if so, why? IOW, will anything break if this + feature is removed !? */ return call1 (intern ("read-minibuffer"), build_string ("Lisp expression: ")); -- cgit v1.2.1 From faf99dcb37bedf7ebceaf2b3015f20d05c391e16 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jul 2019 15:32:20 +0300 Subject: Improve description of image descriptors * doc/lispref/display.texi (Image Descriptors): More accurate description of where image files are looked up. (Bug#36523) --- doc/lispref/display.texi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b6fda1cd807..276d60b21a7 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5055,7 +5055,10 @@ Every image descriptor must include this property. @item :file @var{file} This says to load the image from file @var{file}. If @var{file} is -not an absolute file name, it is expanded in @code{data-directory}. +not an absolute file name, it is expanded relative to the +@file{images} subdirectory of @code{data-directory}, and failing that, +relative to the directories listed by @code{x-bitmap-file-path} +(@pxref{Face Attributes}). @item :data @var{data} This specifies the raw image data. Each image descriptor must have -- cgit v1.2.1 From ff738ab8b8e5588f568145ed5715b859c48219b8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jul 2019 17:25:46 +0300 Subject: Minor copyedit of "Font Lock" in user manual * doc/emacs/display.texi (Font Lock): Make the wording about "enabling Font Lock" crystal clear. (Bug#36529) --- doc/emacs/display.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 435c21fe738..ac1ce3606b6 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -836,10 +836,10 @@ for instance, programming language modes fontify syntactically relevant constructs like comments, strings, and function names. @findex font-lock-mode - Font Lock mode is enabled by default. To toggle it in the current -buffer, type @kbd{M-x font-lock-mode}. A positive numeric argument -unconditionally enables Font Lock mode, and a negative or zero -argument disables it. + Font Lock mode is enabled by default in major modes that support it. +To toggle it in the current buffer, type @kbd{M-x font-lock-mode}. A +positive numeric argument unconditionally enables Font Lock mode, and +a negative or zero argument disables it. @findex global-font-lock-mode @vindex global-font-lock-mode -- cgit v1.2.1 From e2344a770ea55fbbe40800797dad002922a097b9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 6 Jul 2019 12:16:24 -0400 Subject: * lisp/svg.el, lisp/progmodes/ada-mode.el: Fix bug#36360. Tell package.el their version number, for better behavior w.r.t the versions available in GNU ELPA --- lisp/progmodes/ada-mode.el | 1 + lisp/svg.el | 1 + 2 files changed, 2 insertions(+) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index eb7efc3cf04..c9aba0a50d1 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -7,6 +7,7 @@ ;; Emmanuel Briot ;; Maintainer: Stephen Leake ;; Keywords: languages ada +;; Version: 4.0 ;; This file is part of GNU Emacs. diff --git a/lisp/svg.el b/lisp/svg.el index 0399c424c85..1f717293358 100644 --- a/lisp/svg.el +++ b/lisp/svg.el @@ -4,6 +4,7 @@ ;; Author: Lars Magne Ingebrigtsen ;; Keywords: image +;; Version: 0.5 ;; This file is part of GNU Emacs. -- cgit v1.2.1 From 1e6d8e003ce28f508e26eb7107ce5bd0e20bb4b8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 6 Jul 2019 21:33:45 +0300 Subject: ; * doc/emacs/killing.texi (Secondary Selection): Fix last change. --- doc/emacs/killing.texi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 670decd67bd..c554d2e2839 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -605,10 +605,9 @@ This command does not alter the kill ring. @kindex M-mouse-1 @item M-mouse-1 Set one endpoint for the @dfn{secondary selection} -(@code{mouse-start-secondary}). Use @kbd{M-mouse-3} to set the other -end and complete the selection. This command can also cancel any -existing secondary selection without starting a new one, if you click -@kbd{M-mouse-1} on the mode line or on the header line. +(@code{mouse-start-secondary}); use @kbd{M-mouse-3} to set the other +end and complete the selection. This command cancels any existing +secondary selection, when it starts a new one. @findex mouse-secondary-save-then-kill @kindex M-mouse-3 -- cgit v1.2.1