Commit d8732a82 authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

1e6d8e00 (origin/emacs-26) ; * doc/emacs/killing.texi (Secondary Selec...
e2344a77 * lisp/svg.el, lisp/progmodes/ada-mode.el: Fix bug#36360.
ff738ab8 Minor copyedit of "Font Lock" in user manual
faf99dcb Improve description of image descriptors
21351ccc ; * src/lread.c (Fread): Make the comment wording more accurate.
d176090f Improve documentation of secondary selections
8910fe1d * src/fns.c (Fmapconcat): Doc fix.  (Bug#36418)

# Conflicts:
#	lisp/svg.el
parents 206a9b4b 1e6d8e00
Pipeline #2276 failed with stage
in 50 minutes and 59 seconds
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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.
......
......@@ -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. */)
......
......@@ -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: "));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment