Merge from origin/emacs-26

5a6bb01 (origin/emacs-26) Fix building etc/DOC in the MSDOS port
274c979 * lisp/select.el (gui-get-selection): Doc fix.
ad731b0 ; * doc/lispref/display.texi (Temporary Displays): Fix typos.
f1450e9 Complete documentation of syntax flags by adding `c'
6bdcaec Fix typos and minor wording issues in ELisp manual
febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
6c2e21e Avoid segfault in processes of type 'pipe'
60e10c5 Remove repetitions in documentation strings
208e752 * lisp/image.el (image-load-path): Doc fix.
92e0fd8 ; * etc/NEWS: Remove a FIXME.  (Bug#31122)

Conflicts:
	etc/NEWS
This commit is contained in:
Glenn Morris 2018-04-14 07:50:45 -07:00
commit db71b31827
18 changed files with 51 additions and 41 deletions

View file

@ -1241,7 +1241,7 @@ displays the buffer specified by @var{buffer-or-name} @emph{before}
running @var{body}.
@end defmac
A window showing a temporary buffer can be fit to the size of that
A window showing a temporary buffer can be fitted to the size of that
buffer using the following mode:
@defopt temp-buffer-resize-mode
@ -1274,7 +1274,7 @@ positive integer. At the time the function is called, the window to be
resized is selected.
@end defopt
The following function uses the current buffer for temporal display:
The following function uses the current buffer for temporary display:
@defun momentary-string-display string position &optional char message
This function momentarily displays @var{string} in the current buffer at

View file

@ -739,7 +739,7 @@ DEFUN ("foo", Ffoo, Sfoo, 0, UNEVALLED, 0
"(list (read-char-by-name \"Insert character: \")\
(prefix-numeric-value current-prefix-arg)\
t))",
doc: /* @dots{} /*)
doc: /* @dots{} */)
@end group
@end example
@ -776,7 +776,7 @@ this:
@example
@group
DEFUN ("bar", Fbar, Sbar, 0, UNEVALLED, 0
doc: /* @dots{} /*
doc: /* @dots{} */
attributes: @var{attr1} @var{attr2} @dots{})
@end group
@end example

View file

@ -1388,9 +1388,10 @@ similar to the code generated by the @code{define-minor-mode} macro):
@example
(interactive (list (or current-prefix-arg 'toggle)))
(let ((enable (if (eq arg 'toggle)
(not foo-mode) ; @r{this mode's mode variable}
(> (prefix-numeric-value arg) 0))))
(let ((enable
(if (eq arg 'toggle)
(not foo-mode) ; @r{this is the mode's mode variable}
(> (prefix-numeric-value arg) 0))))
(if enable
@var{do-enable}
@var{do-disable}))
@ -3375,7 +3376,7 @@ easy to add the @code{font-lock-multiline} property by hand.
The @code{font-lock-multiline} property is meant to ensure proper
refontification; it does not automatically identify new multiline
constructs. Identifying the requires that Font Lock mode operate on
constructs. Identifying them requires that Font Lock mode operate on
large enough chunks at a time. This will happen by accident on many
cases, which may give the impression that multiline constructs magically
work. If you set the @code{font-lock-multiline} variable

View file

@ -569,9 +569,9 @@ The optional argument @var{cur-col} specifies the current column when
the function is called. This is the window-relative horizontal
coordinate of point, measured in units of font width of the frame's
default face. Providing it speeds up the function, especially in very
long lines, because it doesn't have to go back in the buffer in order
to determine the current column. Note that @var{cur-col} is also
counted from the visual start of the line.
long lines, because the function doesn't have to go back in the buffer
in order to determine the current column. Note that @var{cur-col} is
also counted from the visual start of the line.
@end defun
@defun count-screen-lines &optional beg end count-final-newline window

View file

@ -728,7 +728,7 @@ to every element of @var{sequence} returns non-@code{nil}.
@result{} t
@end group
@group
(seq-some #'numberp [2 4 "6"])
(seq-every-p #'numberp [2 4 "6"])
@result{} nil
@end group
@end example
@ -854,7 +854,7 @@ it is a function of two arguments to use instead of the default @code{equal}.
@end group
@group
(seq-uniq '(1 2 2.0 1.0) #'=)
@result{} [1 2]
@result{} (1 2)
@end group
@end example
@end defun

View file

@ -1018,7 +1018,7 @@ corresponds to each syntax flag.
@item
@samp{3} @tab @code{(lsh 1 18)} @tab @samp{n} @tab @code{(lsh 1 22)}
@item
@samp{4} @tab @code{(lsh 1 19)}
@samp{4} @tab @code{(lsh 1 19)} @tab @samp{c} @tab @code{(lsh 1 23)}
@end multitable
@defun string-to-syntax desc

View file

@ -1613,7 +1613,7 @@ that the line ends exactly at @code{fill-column}. It returns
The argument @var{how}, if non-@code{nil} specifies explicitly the style
of justification. It can be @code{left}, @code{right}, @code{full},
@code{center}, or @code{none}. If it is @code{t}, that means to do
@code{center}, or @code{none}. If it is @code{t}, that means to
follow specified justification style (see @code{current-justification},
below). @code{nil} means to do full justification.
@ -2977,7 +2977,7 @@ If any text in the region already has a non-@code{nil} @code{face} property,
those face(s) are retained. This function sets the @code{face}
property to a list of faces, with @var{face} as the first element (by
default) and the pre-existing faces as the remaining elements. If the
optional argument @var{append} is non-@code{nil}, @var{face} is
optional argument @var{appendp} is non-@code{nil}, @var{face} is
appended to the end of the list instead. Note that in a face list,
the first occurring value for each attribute takes precedence.
@ -4298,10 +4298,10 @@ read register names use this function.
This function can be used to transpose stretches of text:
@defun transpose-regions start1 end1 start2 end2 &optional leave-markers
This function exchanges two nonoverlapping portions of the buffer.
Arguments @var{start1} and @var{end1} specify the bounds of one portion
and arguments @var{start2} and @var{end2} specify the bounds of the
other portion.
This function exchanges two nonoverlapping portions of the buffer (if
they overlap, the function signals an error). Arguments @var{start1}
and @var{end1} specify the bounds of one portion and arguments
@var{start2} and @var{end2} specify the bounds of the other portion.
Normally, @code{transpose-regions} relocates markers with the transposed
text; a marker previously positioned within one of the two transposed

View file

@ -1004,12 +1004,13 @@ affect, nor be affected by, any uses of the same variable symbol
elsewhere in the program.
@item
Otherwise, define the variable with @code{defvar}, @code{defconst}, or
@code{defcustom}. @xref{Defining Variables}. Usually, the definition
should be at top-level in an Emacs Lisp file. As far as possible, it
should include a documentation string which explains the meaning and
purpose of the variable. You should also choose the variable's name
to avoid name conflicts (@pxref{Coding Conventions}).
Otherwise, define the variable with @code{defvar}, @code{defconst}
(@pxref{Defining Variables}), or @code{defcustom} (@pxref{Variable
Definitions}). Usually, the definition should be at top-level in an
Emacs Lisp file. As far as possible, it should include a
documentation string which explains the meaning and purpose of the
variable. You should also choose the variable's name to avoid name
conflicts (@pxref{Coding Conventions}).
Then you can bind the variable anywhere in a program, knowing reliably
what the effect will be. Wherever you encounter the variable, it will
@ -1024,7 +1025,7 @@ variables like @code{case-fold-search}:
@group
(defun search-for-abc ()
"Search for the string \"abc\", ignoring case differences."
(let ((case-fold-search nil))
(let ((case-fold-search t))
(re-search-forward "abc")))
@end group
@end example

View file

@ -904,7 +904,7 @@ include mode and header line and a bottom divider, if any.
If @var{window} is part of a horizontal combination and the value of the
option @code{fit-window-to-buffer-horizontally} (see below) is
non-@code{nil}, this function adjusts @var{window}'s height. The new
non-@code{nil}, this function adjusts @var{window}'s width. The new
width of @var{window} is calculated from the maximum length of its
buffer's lines that follow the current start position of @var{window}.
The optional argument @var{max-width} specifies a maximum width and

View file

@ -1375,10 +1375,9 @@ gets evaluated after the new mode's hook has run. This can be used to
incorporate configuration changes made in the mode hook into the
mode's setup.
** Autoload files can be generated without timestamps,
by setting 'autoload-timestamps' to nil.
FIXME As an experiment, nil is the current default.
If no insurmountable problems before next release, it can stay that way.
** Autoload files are now generated without timestamps.
Set 'autoload-timestamps' to a non-nil value to get timestamps in
autoload files.
** 'gnutls-boot' now takes a parameter ':complete-negotiation' that
says that negotiation should complete even on non-blocking sockets.

View file

@ -851,7 +851,7 @@ and \\[backward-word], which see.
Value is normally t.
If an edge of the buffer or a field boundary is reached, point is left there
there and the function returns nil. Field boundaries are not noticed
and the function returns nil. Field boundaries are not noticed
if `inhibit-field-text-motion' is non-nil."
(interactive "^p")
(if (eq (current-bidi-paragraph-direction) 'left-to-right)
@ -867,7 +867,7 @@ and \\[forward-word], which see.
Value is normally t.
If an edge of the buffer or a field boundary is reached, point is left there
there and the function returns nil. Field boundaries are not noticed
and the function returns nil. Field boundaries are not noticed
if `inhibit-field-text-motion' is non-nil."
(interactive "^p")
(if (eq (current-bidi-paragraph-direction) 'left-to-right)

View file

@ -134,7 +134,7 @@ By default, `semantic-tag-similar-ignorable-attributes' is referenced for
attributes, and IGNORABLE-ATTRIBUTES will augment this list.
Note that even though :name is not an attribute, it can be used to
to indicate lax comparison of names via `semantic--tag-similar-names-p'")
indicate lax comparison of names via `semantic--tag-similar-names-p'")
;; Note: optional thing is because overloadable fcns don't handle this
;; quite right.

View file

@ -676,7 +676,7 @@ displays an image file as hex. `image-minor-mode' provides the key
to display an image file as the actual image.
You can use `image-mode-as-hex' in `auto-mode-alist' when you want to
to display an image file as hex initially.
display an image file as hex initially.
See commands `image-mode' and `image-minor-mode' for more information
on these modes."

View file

@ -116,6 +116,9 @@ told that the data would have the associated suffix if saved to a file.")
(list (file-name-as-directory (expand-file-name "images" data-directory))
'data-directory 'load-path)
"List of locations in which to search for image files.
The images for icons shown in the tool bar are also looked up
in these locations.
If an element is a string, it defines a directory to search.
If an element is a variable symbol whose value is a string, that
value defines a directory to search.

View file

@ -291,8 +291,10 @@ all upper-case names. The most often used ones, in addition to
`PRIMARY', are `SECONDARY' and `CLIPBOARD'.
DATA-TYPE is usually `STRING', but can also be one of the symbols
in `selection-converter-alist', which see. This argument is
ignored on NS, MS-Windows and MS-DOS."
in `selection-converter-alist', which see. Window systems other
than X usually support only a small subset of these symbols, in
addition to `STRING'; MS-Windows supports `TARGETS', which reports
the formats available in the clipboard if TYPE is `CLIPBOARD'."
(let ((data (gui-backend-get-selection (or type 'PRIMARY)
(or data-type 'STRING))))
(when (and (stringp data)

View file

@ -1616,7 +1616,7 @@ viewing can be useful. Each entry has the structure
MACRO-RE is matched against the macro. SEARCH-RE is the regexp used
to search for cross references. `%s' in this regexp is replaced with
with the macro argument at point. HIGHLIGHT is an integer indicating
the macro argument at point. HIGHLIGHT is an integer indicating
which subgroup of the match should be highlighted."
:group 'reftex-viewing-cross-references
:type '(repeat (group (regexp :tag "Macro Regexp ")

View file

@ -165,8 +165,8 @@ s/ *@LIBXPM@//
/^lisp\.mk:/,/^$/c\
lisp.mk: $(lispsource)/loadup.el\
@rm -f $@\
${AM_V_GEN}printf 'shortlisp = \\n' > $@\
${AM_V_GEN}sed -n 's/^[ \t]*(load "\([^"]*\)".*/\1/p' $< | sed -e "s/$/.elc \/" -e "s/\.el\.elc/.el/" >> $@\
${AM_V_GEN}printf 'shortlisp = \\\\\\n' > $@\
${AM_V_GEN}sed -n 's/^[ \t]*(load "\\([^"]*\\)".*/\\1/p' $< | sed -e "s/\$\$/.elc \\\\/" -e "s/\\.el\\.elc/.el/" >> $@\
${AM_V_GEN}djecho "" >> $@
#"

View file

@ -2471,6 +2471,10 @@ usage: (make-pipe-process &rest ARGS) */)
/* This may signal an error. */
setup_process_coding_systems (proc);
pset_decoding_buf (p, empty_unibyte_string);
eassert (p->decoding_carryover == 0);
pset_encoding_buf (p, empty_unibyte_string);
specpdl_ptr = specpdl + specpdl_count;
return proc;