martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse Source 
83187cd (origin/emacs-26) Skip mouse-face overlap check when mouse-fa...
a6d8f2b Fix capitalization of "Mail-Followup-To"
f9640f9 * lisp/progmodes/grep.el (grep-compute-defaults):
3a26c8a Semantic manual fixes
106a9f6 More improvements in the Emacs manual
244db85 * doc/misc/viper.texi (File and Buffer Handling): Add missing...
f0d6a16 Fix documentation of 'x-underline-at-descent-line'
69a8f45 * lisp/textmodes/flyspell.el (flyspell-get-word): Doc fix.
05214c6 Correct variable markup in manuals
355c644 Improve the "Sending Mail" chapter of Emacs manual

Conflicts:
	src/nsterm.m
	src/w32term.c
This commit is contained in:
Glenn Morris
2018-02-22 09:27:21 -08:00
parent cb55ccae8b 83187cd900
commit 6bfb754c3e
18 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/emacs/display.texi
View File

@@ -1848,8 +1848,11 @@ it may improve the legibility of underlined text for certain fonts.
area.) The variable @code{x-underline-at-descent-line} determines how
to draw underlined text. The default is @code{nil}, which means to
draw it at the baseline level of the font; if you change it to
@code{nil}, Emacs draws the underline at the same height as the font's
descent line.
@code{t}, Emacs draws the underline at the same height as the font's
descent line. (If non-default line spacing was specified for the
underlined text, see @ref{Line Height,,, elisp, The Emacs Lisp
Reference Manual}, Emacs draws the underline below the additional
spacing.)
@vindex overline-margin
The variable @code{overline-margin} specifies the vertical position

4
doc/emacs/help.texi
View File

@@ -595,8 +595,8 @@ typing @kbd{C-h}, @kbd{?}, or @key{F1}
few prefix keys for which not all of these keys work---those that
provide their own bindings for that key. One of these prefix keys
is @key{ESC}, because @kbd{@key{ESC} C-h} is actually @kbd{C-M-h},
which marks a defun. However, @kbd{@key{ESC} @key{F1}} and
@kbd{@key{ESC} ?} work fine.)
which marks a defun. However, @w{@kbd{@key{ESC} @key{F1}}} and
@w{@kbd{@key{ESC} ?}} work fine.)
@node Help Files
@section Help Files

4
doc/emacs/m-x.texi
View File

@@ -82,8 +82,8 @@ setting of @code{suggest-key-bindings} affects these hints as well.
In this manual, when we speak of running a command by name, we often
omit the @key{RET} that terminates the name. Thus we might say
@kbd{M-x auto-fill-mode} rather than @kbd{M-x auto-fill-mode
@key{RET}}. We mention the @key{RET} only for emphasis, such as when
@kbd{M-x auto-fill-mode} rather than @w{@kbd{M-x auto-fill-mode
@key{RET}}}. We mention the @key{RET} only for emphasis, such as when
the command is followed by arguments.
@findex execute-extended-command

4
doc/emacs/mini.texi
View File

@@ -117,7 +117,7 @@ second slash in the pair. In the example above,
@file{/u2/emacs/src/} is ignored, so the argument you supplied is
@file{/etc/termcap}. The ignored part of the file name is dimmed if
the terminal allows it. (To disable this dimming, turn off File Name
Shadow mode with the command @kbd{M-x file-name-shadow-mode}.)
Shadow mode with the command @w{@kbd{M-x file-name-shadow-mode}}.)
When completing remote file names (@pxref{Remote Files}), a double
slash behaves slightly differently: it causes Emacs to ignore only the
@@ -747,7 +747,7 @@ it by typing @key{RET}.
@vindex isearch-resume-in-command-history
Incremental search does not, strictly speaking, use the minibuffer.
Therefore, although it behaves like a complex command, it normally
does not appear in the history list for @kbd{C-x @key{ESC} @key{ESC}}.
does not appear in the history list for @w{@kbd{C-x @key{ESC} @key{ESC}}}.
You can make incremental search commands appear in the history by
setting @code{isearch-resume-in-command-history} to a non-@code{nil}
value. @xref{Incremental Search}.

44
doc/emacs/sending.texi
View File

@@ -70,7 +70,7 @@ or using some other method. @xref{Mail Sending}, for details.
@example
To: subotai@@example.org
CC: mongol.soldier@@example.net, rms@@gnu.org
Cc: mongol.soldier@@example.net, rms@@gnu.org
Subject: Re: What is best in life?
From: conan@@example.org
--text follows this line--
@@ -152,23 +152,23 @@ more than one address, use commas to separate them.
@item Subject
The subject of the message.
@item CC
@item Cc
Additional mailing address(es) to send the message to. This is like
@samp{To}, except that these readers should not regard the message as
directed at them.
@item BCC
@item Bcc
Additional mailing address(es) to send the message to, which should
not appear in the header of the message actually sent. @samp{BCC} stands
not appear in the header of the message actually sent. @samp{Bcc} stands
for @dfn{blind carbon copies}.
@item FCC
@item Fcc
The name of a file, to which a copy of the sent message should be
appended. Emacs writes the message in mbox format, unless the file is
in Babyl format (used by Rmail before Emacs 23), in which case Emacs
writes in Babyl format. If an Rmail buffer is visiting the file,
Emacs updates it accordingly. To specify more than one file, use
several @samp{FCC} fields, with one file name in each field.
several @samp{Fcc} fields, with one file name in each field.
@item Reply-to
An address to which replies should be sent, instead of @samp{From}.
@@ -180,7 +180,7 @@ This field takes precedence over @samp{Reply-to}. It is used because
some mailing lists set the @samp{Reply-to} field for their own
purposes (a somewhat controversial practice).
@item Mail-followup-to
@item Mail-Followup-To
One of more address(es) to use as default recipient(s) for follow-up
messages. This is typically used when you reply to a message from a
mailing list that you are subscribed to, and want replies to go to the
@@ -198,7 +198,7 @@ this is normally filled in automatically for you.
@end table
@noindent
The @samp{To}, @samp{CC}, and @samp{BCC} fields can appear any number
The @samp{To}, @samp{Cc}, and @samp{Bcc} fields can appear any number
of times, and each such header field can contain multiple addresses,
separated by commas. This way, you can specify any number of places
to send the message. These fields can also have continuation lines:
@@ -221,11 +221,11 @@ To: foo@@example.net, this@@example.net,
buffer by setting the variable @code{mail-default-headers} to a
string. Then @kbd{C-x m} inserts this string into the message
headers. For example, here is how to add a @samp{Reply-to} and
@samp{FCC} header to each message:
@samp{Fcc} header to each message:
@smallexample
(setq mail-default-headers
"Reply-to: foo@@example.com\nFCC: ~/Mail/sent")
"Reply-to: foo@@example.com\nFcc: ~/Mail/sent")
@end smallexample
@noindent
@@ -245,7 +245,7 @@ aliases are defined in the file @file{~/.mailrc}. You can specify a
different file name to use, by setting the variable
@code{mail-personal-alias-file}.
To define an alias in @file{.mailrc}, write a line like this:
To define an alias in @file{~/.mailrc}, write a line like this:
@example
alias @var{nick} @var{fulladdresses}
@@ -276,7 +276,7 @@ of the address, such as the person's full name. Emacs puts them in if
they are needed. For instance, it inserts the above address as
@samp{"John Q. Smith" <none@@example.com>}.
Emacs also recognizes include commands in @file{.mailrc}. They
Emacs also recognizes include commands in @file{~/.mailrc}. They
look like this:
@example
@@ -284,7 +284,7 @@ source @var{filename}
@end example
@noindent
The @file{.mailrc} file is not unique to Emacs; many other
The @file{~/.mailrc} file is not unique to Emacs; many other
mail-reading programs use it for mail aliases, and it can contain
various other commands. However, Emacs ignores everything except
alias definitions and include commands.
@@ -293,7 +293,7 @@ alias definitions and include commands.
Mail aliases expand as abbrevs---that is to say, as soon as you type
a word-separator character after an alias (@pxref{Abbrevs}). This
expansion takes place only within the @samp{To}, @samp{From},
@samp{CC}, @samp{BCC}, and @samp{Reply-to} header fields (plus their
@samp{Cc}, @samp{Bcc}, and @samp{Reply-to} header fields (plus their
@samp{Resent-} variants); it does not take place in other header
fields, such as @samp{Subject}.
@@ -418,16 +418,16 @@ Move to the @samp{To} header (@code{message-goto-to}).
@item C-c C-f C-s
Move to the @samp{Subject} header (@code{message-goto-subject}).
@item C-c C-f C-c
Move to the @samp{CC} header (@code{message-goto-cc}).
Move to the @samp{Cc} header (@code{message-goto-cc}).
@item C-c C-f C-b
Move to the @samp{BCC} header (@code{message-goto-bcc}).
Move to the @samp{Bcc} header (@code{message-goto-bcc}).
@item C-c C-f C-r
Move to the @samp{Reply-To} header (@code{message-goto-reply-to}).
Move to the @samp{Reply-to} header (@code{message-goto-reply-to}).
@item C-c C-f C-f
Move to the @samp{Mail-Followup-To} header field
(@code{message-goto-followup-to}).
@item C-c C-f C-w
Add a new @samp{FCC} header field, with file-name completion
Add a new @samp{Fcc} header field, with file-name completion
(@code{message-goto-fcc}).
@item C-c C-b
Move to the start of the message body (@code{message-goto-body}).
@@ -463,7 +463,7 @@ the body.
@findex message-tab
@kindex TAB @r{(Message mode)}
While editing a header field that contains addresses, such as
@samp{To:}, @samp{CC:} and @samp{BCC:}, you can complete an address by
@samp{To:}, @samp{Cc:} and @samp{Bcc:}, you can complete an address by
typing @key{TAB} (@code{message-tab}). This attempts to insert the
full name corresponding to the address based on a couple of methods,
including EUDC, a library that recognizes a number of directory server
@@ -534,9 +534,9 @@ and for the attachment's @dfn{content type}, @dfn{description}, and
automatically; just type @key{RET} to accept the default. The
description is a single line of text that the recipient will see next
to the attachment; you may also choose to leave this empty. The
disposition is either @samp{inline} (the default), which means the
recipient will see a link to the attachment within the message body,
or @samp{attachment}, which means the link will be separate from the
disposition is either @samp{inline}, which means the recipient will
see a link to the attachment within the message body, or
@samp{attachment}, which means the link will be separate from the
body.
@findex mail-add-attachment

2
doc/lispref/minibuf.texi
View File

@@ -1916,7 +1916,7 @@ may internally call functions in @code{completion-at-point-functions}
many times, but care about the value of @var{collection} for only some
of these calls. By supplying a function for @var{collection}, Emacs
can defer generating completions until necessary. You can use
@var{completion-table-dynamic} to create a wrapper function:
@code{completion-table-dynamic} to create a wrapper function:
@smallexample
;; Avoid this pattern.

2
doc/lispref/text.texi
View File

@@ -1638,7 +1638,7 @@ This function returns the proper justification style to use for filling
the text around point.
This returns the value of the @code{justification} text property at
point, or the variable @var{default-justification} if there is no such
point, or the variable @code{default-justification} if there is no such
text property. However, it returns @code{nil} rather than @code{none}
to mean ``don't justify''.
@end defun

2
doc/misc/dired-x.texi
View File

@@ -733,7 +733,7 @@ and an optional argument @var{marker-char} specifies the marker used.
@findex dired-mark-suffix
Mark all files with a certain suffix for use in later commands. A @samp{.}
is not automatically prepended to the string entered, you must type it
explicitly. This is different from @var{dired-mark-extension} which prepends
explicitly. This is different from @code{dired-mark-extension} which prepends
a @samp{.} if not present.
If invoked with prefix argument @kbd{C-u}, this command unmarks files instead.
If called with the @kbd{C-u C-u} prefix, asks for a character to use

4
doc/misc/epa.texi
View File

@@ -363,7 +363,7 @@ Similarly, when you save the buffer to a @file{foo.gpg} file,
encrypted data is written.
The file name pattern for encrypted files can be controlled by
@var{epa-file-name-regexp}.
@code{epa-file-name-regexp}.
@defvar epa-file-name-regexp
Regexp which matches filenames treated as encrypted.
@@ -392,7 +392,7 @@ public key encryption.
@end deffn
You can also change the default behavior with the variable
@var{epa-file-select-keys}.
@code{epa-file-select-keys}.
@defvar epa-file-select-keys
Control whether or not to pop up the key selection dialog.

2
doc/misc/gnus.texi
View File

@@ -15179,7 +15179,7 @@ All new mail files will get this file mode. The default is @code{#o600}.
@item mail-source-movemail-program
@vindex mail-source-movemail-program
If non-@code{nil}, name of program for fetching new mail. If
@code{nil}, @code{movemail} in @var{exec-directory}.
@code{nil}, @code{movemail} in @code{exec-directory}.
@end table

5
doc/misc/semantic.texi
View File

@@ -445,7 +445,7 @@ completion lists.
@node Tools
@section Tools
These files contain various tools a user can use.
These files contain various tools for users.
@table @file
@item semantic-idle.el
@@ -485,8 +485,7 @@ A bunch of small minor-modes that exposes aspects of the semantic
parser state. Includes @code{semantic-stickyfunc-mode}.
@item document.el
@itemx document-vars.el
Create an update comments for tags.
Create and update comments for tags.
@item semantic-adebug.el
Extensions of @file{data-debug.el} for @semantic{}.

4
doc/misc/tramp.texi
View File

@@ -820,7 +820,7 @@ External methods save on the overhead of encoding and decoding of
inline methods.
Since external methods have the overhead of opening a new channel,
files smaller than @var{tramp-copy-size-limit} still use inline
files smaller than @code{tramp-copy-size-limit} still use inline
methods.
@table @asis
@@ -1219,7 +1219,7 @@ Start by using an inline method.
External methods might be more efficient for large files, but most
@value{tramp} users edit small files more often than large files.
Enable compression, @var{tramp-inline-compress-start-size}, for a
Enable compression, @code{tramp-inline-compress-start-size}, for a
performance boost for large files.
Since @command{ssh} has become the most common method of remote host

5
doc/misc/url.texi
View File

@@ -1271,8 +1271,9 @@ operation at startup.
@item TMPDIR
@vindex TMPDIR
@vindex url-temporary-directory
If this is defined, @var{url-temporary-directory} is initialized from
it.
If this is defined, @code{url-temporary-directory} is initialized from
it. This variable was obsoleted in 23.1, please use
@code{temporary-file-directory} instead.
@end table
The following user options affect the general operation of

8
doc/misc/viper.texi
View File

@@ -3579,7 +3579,7 @@ Viper customization file. @xref{Viper Specials}, for details.
Minibuffer can be edited similarly to Insert state, and you can switch
between Insert/Replace/Vi states at will.
Some users prefer plain Emacs feel in the minibuffer. To this end, set
@var{viper-vi-style-in-minibuffer} to @code{nil}.
@code{viper-vi-style-in-minibuffer} to @code{nil}.
@cindex Insert state
@@ -4063,15 +4063,15 @@ Edit <count> file, or edit files. The count comes from @kbd{:args}.
Like @kbd{:n}, but the meaning of the variable
@var{ex-cycle-other-window} is reversed.
@item :b
Switch to another buffer. If @var{ex-cycle-other-window} is @code{t},
Switch to another buffer. If @code{ex-cycle-other-window} is @code{t},
switch in another window. Buffer completion is supported.
The variable @var{viper-read-buffer-function} controls which function is
The variable @code{viper-read-buffer-function} controls which function is
actually used to read the buffer name. The default is @code{read-buffer},
but better alternatives are also available in Emacs (e.g.,
@code{ido-read-buffer}).
@vindex @var{viper-read-buffer-function}
@item :B
Like @kbd{:b}, but the meaning of @var{ex-cycle-other-window} is reversed.
Like @kbd{:b}, but the meaning of @code{ex-cycle-other-window} is reversed.
@item :<address>r <name>
Read the file <name> into the buffer after the line <address>.
@item v, V, C-v

2
lisp/progmodes/grep.el
View File

@@ -734,6 +734,8 @@ This function is called from `compilation-filter-hook'."
(grep-use-null-device ,grep-use-null-device)
(grep-find-command ,grep-find-command)
(grep-find-template ,grep-find-template)
(grep-use-null-filename-separator
,grep-use-null-filename-separator)
(grep-find-use-xargs ,grep-find-use-xargs)
(grep-highlight-matches ,grep-highlight-matches))))))

2
lisp/textmodes/flyspell.el
View File

@@ -1309,7 +1309,7 @@ that may be included as part of a word (see `ispell-dictionary-alist').
This finds the word to spell-check by searching for CASECHARS defined
in `ispell-dictionary-alist' for the current dictionary. Thus, the
word could be far away of point if point is inside whitespace or
word could be far away from point if point is inside whitespace or
punctuation characters, or in text that belongs to a different
language."
(let* ((flyspell-casechars (flyspell-get-casechars))

10
src/xdisp.c
View File

@@ -31377,10 +31377,12 @@ note_mouse_highlight (struct frame *f, int x, int y)
/* Check mouse-face highlighting. */
if (! same_region
/* If there exists an overlay with mouse-face overlapping
the one we are currently highlighting, we have to
check if we enter the overlapping overlay, and then
highlight only that. */
|| (OVERLAYP (hlinfo->mouse_face_overlay)
the one we are currently highlighting, we have to check
if we enter the overlapping overlay, and then highlight
only that. Skip the check when mouse-face highlighting
is currently hidden to avoid Bug#30519. */
|| (!hlinfo->mouse_face_hidden
&& OVERLAYP (hlinfo->mouse_face_overlay)
&& mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
{
/* Find the highest priority overlay with a mouse-face. */

2
src/xterm.c
View File

@@ -13250,6 +13250,8 @@ small font display sizes. */);
DEFVAR_BOOL ("x-underline-at-descent-line",
x_underline_at_descent_line,
doc: /* Non-nil means to draw the underline at the same place as the descent line.
(If `line-spacing' is in effect, that moves the underline lower by
that many pixels.)
A value of nil means to draw the underline according to the value of the
variable `x-use-underline-position-properties', which is usually at the
baseline level. The default value is nil. */);