diff options
-rw-r--r-- | doc/emacs/display.texi | 8 | ||||
-rw-r--r-- | doc/emacs/killing.texi | 15 | ||||
-rw-r--r-- | doc/lispref/display.texi | 5 | ||||
-rw-r--r-- | lisp/progmodes/ada-mode.el | 1 | ||||
-rw-r--r-- | src/fns.c | 2 | ||||
-rw-r--r-- | src/lread.c | 5 |
6 files changed, 23 insertions, 13 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index fe726ea28e5..0ce291335a9 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 diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 9b9c890331e..c554d2e2839 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -605,16 +605,19 @@ 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 cancels any existing +secondary selection, when it starts a new one. @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 diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 5fb6433c7aa..a38569f7263 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5108,7 +5108,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 diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 404e704373e..4a4e1a7aad4 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -7,6 +7,7 @@ ;; Emmanuel Briot <briot@gnat.com> ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org> ;; Keywords: languages ada +;; Version: 4.0 ;; This file is part of GNU Emacs. diff --git a/src/fns.c b/src/fns.c index 2fc000a7f43..77c0b15037f 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2674,7 +2674,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. */) diff --git a/src/lread.c b/src/lread.c index 5fa90cad3f3..27529c3d630 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2209,7 +2209,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: ")); |