Merge from origin/emacs-26

0276743 (origin/emacs-26) Doc string fix in latin-alt.el
c9269af Minor improvements in package.texi
898a3e4 Minor improvement in Emacs user manual
8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.
989d0af Improve documentation of mini-window resizing
923e415 More changes in the Emacs manual
565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24...
2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350)
19fa6d5 Fix --no-build-details for w32 and macOS
979944c * doc/lispref/anti.texi (Antinews): Add some more antinews.
c2727e3 Fix crashes when run with --no-build-details
dc08490 More changes for the manual
04c5bd5 Doc fixes for process functions (Bug#30349)
e209034 Fix shr and CSS 4 color maps
5fe8192 Yet another round of improvements in the manual

Conflicts:
doc/emacs/files.texi
test/lisp/subr-tests.el

Doc string fix in latin-alt.el

* lisp/leim/quail/latin-alt.el ("dutch"): Doc fix.  Reported by
Robert Pluim <rpluim@gmail.com>.

Minor improvements in package.texi

* doc/emacs/package.texi (Package Menu): Minor wording change.
(Package Installation): Use HTTPS.  A better @xref to GnuPG
manual.  Suggested by Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.

Minor improvement in Emacs user manual

* doc/emacs/files.texi (Directories): Document that
'directory-free-space-program' and 'directory-free-space-args' are
only for local filesystems.  Suggested by Michael Albinus
<michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.

* doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.

Improve documentation of mini-window resizing

* doc/lispref/minibuf.texi (Minibuffer Windows): Mention
'message-truncate-lines' for preventing resizing of minibuffer
windows.  (Bug#19045)
(Minibuffer Misc): Remove redundant description of
'max-mini-window-height'.
* doc/lispref/display.texi (Echo Area Customization): Adjust
cross-reference.

More changes in the Emacs manual

* doc/emacs/fixit.texi (Undo): Mention 'revert-buffer'.
(Fixing Case): Fix punctuation.
(Spelling): Fix a typo.  Suggested by Toon Claes <toon@iotcl.com>
in emacs-manual-bugs@gnu.org.

* doc/emacs/modes.texi (Major Modes): Break a long sentence into
2.  Reported by Stefan Kamphausen <stefan.kamphausen@acrolinx.com>
in emacs-manual-bugs@gnu.org.

* doc/emacs/indent.texi (Just Spaces): Yet another minor
rewording.

* doc/emacs/building.texi (Watch Expressions): Improve wording.
(Multithreaded Debugging): Spell "tool bar" as 2 words.  Reported
by Alberto Sartori <alberto.sartori@sissa.it> in
emacs-manual-bugs@gnu.org.
(Grep Searching): Mention the effect of
'compilation-mode-line-errors'.  (Bug#30397)

* doc/emacs/basic.texi (Moving Point): Minor reformatting and
rewording of what <LEFT> and <RIGHT> do.

Fix iswitchb highlighting: don't mutate buffer name

* lisp/obsolete/iswitchb.el (iswitchb-completions): Copy buffer name
  before applying face

* lisp/emacs-lisp/cl-macs.el (cl--sm-macroexpand): Handle lambda!

(cl--old-macroexpand): Remove.
(cl--sm-macroexpand): Change its calling convention, so it can use
advice-add.  Extend re-binding treatment of vars so it applies to all
var-introducing forms rather than only to 'let'.
(cl-symbol-macrolet): Use advice-add rather than fset.

Clarify that text-quoting-style doesn't affect *Info* (Bug#24519)

* src/doc.c (syms_of_doc) <text-quoting-style>: Clarify that info
manual display is unaffected.

Mention that shell quoting of % on w32 may fail (Bug#19350)

* doc/lispref/os.texi (Security Considerations): Mention that quoting
of '%' assumes no '^' in variable names.
* test/lisp/subr-tests.el (shell-quote-argument-%-on-w32): New test,
demonstrating what doesn't work.

Fix --no-build-details for w32 and macOS

* src/w32term.c (w32_initialize_display_info): Handle nil system-name.
* lisp/term/ns-win.el (window-system-initialization): Don't pass nil
to `x-open-connection'.

* doc/lispref/anti.texi (Antinews): Add some more antinews.

Remove unused duplicate of minibuffer-completion-contents

* src/minibuf.c (Fminibuffer_completion_contents): Remove.
Unused since introduction of minubuffer.el 2008-04-09.
(syms_of_minibuf): Remove Sminibuffer_completion_contents.
* lisp/minibuffer.el (minibuffer-completion-contents): Doc tweak.

Fix crashes when run with --no-build-details

* src/xrdb.c (get_environ_db):
* src/xterm.c (same_x_server, x_term_init):
Don’t assume Fsystem_name returns a string.

More changes for the manual

* doc/emacs/anti.texi (Antinews): Replace 25.2 with 25.3.
Reported by Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.

* doc/emacs/custom.texi (Function Keys): Improve wording.
Suggested by clemens.radermacher@posteo.de in
emacs-manual-bugs@gnu.org.

* doc/emacs/misc.texi (History References): Improve punctuation.
(Terminal emulator): Fix a typo.
(Term Mode): Remove redundant repeated text.
(Invoking emacsclient): Improve wording.  Suggested by Alberto
Sartori <alberto.sartori@sissa.it> in emacs-manual-bugs@gnu.org.

* doc/emacs/files.texi (Visiting): Fix last change.

Doc fixes for process functions (Bug#30349)

* doc/lispref/processes.texi (Asynchronous Processes): Explain what
the 'stopped' state means for a pipe process.
* src/process.c (Fmake_process, Fmake_pipe_process)
(Fmake_serial_process, Fmake_network_process):
* lisp/subr.el (start-process):
* lisp/net/tls.el (open-tls-stream):
* lisp/net/starttls.el (starttls-open-stream):
* lisp/net/gnutls.el (open-gnutls-stream): Remove meaningless phrase
"specify an output stream" phrase from docstring.

Fix shr and CSS 4 color maps

* lisp/net/shr-color.el (shr-color-html-colors-alist): Fix typos.
Add RebeccaPurple.
* lisp/textmodes/css-mode.el (css--color-map): Add fuchsia-magenta
and aqua-cyan aliases.
* test/lisp/textmodes/css-mode-tests.el (css-test-property-values):
Bump color count.

Yet another round of improvements in the manual

* doc/emacs/misc.texi (Document View): Improve wording.  Reported
by lyr3 <lyr3@protonmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/files.texi (Recover): Fix a typo.  Reported by Jorge
<jorge+list@disroot.org> in emacs-manual-bugs@gnu.org.

* doc/emacs/anti.texi (Antinews): Fix typos.  Reported by Justin
Heyes-Jones <justinhj@gmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/mini.texi (Basic Minibuffer): Clarify wording.
Reported by Vivishek Sudhir <vivishek.sudhir@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/cmdargs.texi (MS-Windows Registry): Improve wording
regarding registry keys.

* doc/emacs/macos.texi (Mac OS / GNUstep): Sayu "NeXT Inc."
Reported by Cena Mayo <cenazoic@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/screen.texi (Screen): More accurate wording.
Suggested by Miloš Polakovič <milos@alphamail.org> in
emacs-manual-bugs@gnu.org.

* doc/emacs/indent.texi (Just Spaces): Minor wording change.
Suggested by David Bonnafous <dbonnafo@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/text.texi (TeX Mode, TeX Editing): Improve and
simplify wording.  Suggested by root@vxid.pw <root@vxid.pw> in
emacs-manual-bugs@gnu.org.

* doc/emacs/cmdargs.texi (Window Size X): Minor wording change.

* doc/emacs/display.texi (Highlight Interactively): Fill text.
(Optional Mode Line): Fix typos.  Suggested by Alberto Sartori
<alberto.sartori@sissa.it> in emacs-manual-bugs@gnu.org.

* doc/emacs/building.texi (Debugger Operation): Clarify wording.

* doc/emacs/files.texi (Directories, Comparing Files, Diff Mode)
(Remote Files, File Names, Visiting, Backup Deletion)
(Customize Save, Interlocking): Improve wording and accuracy of
the text.
* doc/emacs/maintaining.texi (VC With A Merging VCS): Don't say
"his".
* doc/emacs/arevert-xtra.texi (Auto Reverting Dired): Minor
wording changes.
(Supporting additional buffers): Moved to ...
* doc/lispref/backups.texi (Reverting): ... here.
* doc/emacs/emacs.texi (Top): Remove "Supporting additional
buffers" from master menu.
* doc/emacs/files.texi (Reverting): Mention use of file
notifications.  Suggested by Michael Albinus
<michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.

* doc/emacs/rmail.texi (Rmail Motion): Clarify what '-' does to
'M-s'.  Suggested by Arthur Milchior <arthur@milchior.fr> in
emacs-manual-bugs@gnu.org.

* doc/emacs/cmdargs.texi (Initial Options): Capitalize "Emacs".
(Action Arguments): Fix a typo.
(Emacs Invocation): Replace em-dash with a comma.  Suggested by
Justin Heyes-Jones <justinhj@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/m-x.texi (M-x): Add an example.  Suggested by Alberto
Sartori <alberto.sartori@sissa.it> in emacs-manual-bugs@gnu.org.

* doc/emacs/calendar.texi (Calendar/Diary, Calendar Unit Motion):
Minor wording changes.

* lisp/comint.el (comint-history-isearch-setup): Check if process is live.

Don't activate comint-history isearch when shell prompt is empty
like in all *Async Shell Command* buffers. (Bug#30187)

* lisp/dired.el (dired-get-marked-files): Add new optional arg 'error'.

Call user-error when it's non-nil and result is empty (bug#30285).

* lisp/dired-aux.el (dired-do-chxxx, dired-do-chmod)
(dired-do-print, dired-do-async-shell-command)
(dired-do-shell-command, dired-do-compress-to)
(dired-mark-confirm, dired-do-create-files)
(dired-do-isearch, dired-do-isearch-regexp)
(dired-do-query-replace-regexp, dired-do-find-regexp):
* lisp/dired-x.el (dired-do-find-marked-files):
Set arg 'error' of dired-get-marked-files call to t.

; Small fixes and indentation

Support occur command operating on the region from Isearch.

* lisp/isearch.el (isearch-occur): Use region-bounds as region arg of occur.
(isearch-query-replace): Use use-region-p.

* lisp/replace.el (occur--region-start-line): Rename from
occur--matches-threshold.
(occur): Use complete lines when region is active for line-oriented occur.
(occur-engine): Count lines either from occur--region-start-line or 1.

Work around macOS faccessat bug

* src/fileio.c (file_accessible_directory_p): Append an
extra "/" to work around macOS bug in faccessat (Bug#30350).

Support list-matching-lines-jump-to-current-line for context lines.

* lisp/replace.el (occur--orig-line-str): Remove.
(occur): Remove occur--orig-line-str.
(occur-engine): Use add-face-text-property to add the face
list-matching-lines-current-line-face to the current line.
Use previous-single-property-change to find occur--final-pos.
(occur-context-lines): New args orig-line and multi-occur-p.
Find the current line in context lines and add face to it.
(Bug#30281)

Merge from origin/emacs-26

c787a49 (origin/emacs-26) * lisp/vc/vc-git.el (vc-git-print-log): Res...
b654791 * doc/emacs/misc.texi (Interactive Shell): Refer to node "Min...
f1102d2 Yet another round of fixing the Emacs manual
76b5a68 * etc/NEWS: Expunge the solecism "allow(s)" + infinitive
b4ff8cc Two minor fixes in Antinews
aafcd12 * etc/NEWS: Rename image-dired-thumb-job-limit
a893924 * lisp/simple.el (async-shell-command, shell-command): Fix gr...
699081f Fix deferred display of async shell-command buffers
d2d5e54 Mention remote file name completion in Emacs manual
f589f5a Yest another round of manual copyedits
1ed4089 Update xdisp.c commentary
e23de39 Fix Bug#30324
e1a9dc0 Recognize Org as builtin package (bug#30310)

Conflicts:
etc/NEWS

Fix inconsistency expanding "//" in Tramp

* doc/misc/tramp.texi (File name completion): Adapt example
expanding "//".

* lisp/net/tramp.el (tramp-handle-substitute-in-file-name): "//" shall
expand the localname only, even when on top of the local part.

* test/lisp/net/tramp-tests.el (tramp-test04-substitute-in-file-name):
Adapt test.

* lisp/vc/vc-git.el (vc-git-print-log): Restrict file scope to a single file

when vc-git-print-log-follow is non-nil (bug#19045).
(vc-git-print-log-follow): Doc fix.

* etc/NEWS: Mention 'vc-git-print-log-follow'.

* doc/emacs/misc.texi (Interactive Shell): Refer to node "Minibuffer File"

for hints how to type remote file names effectively.

Yet another round of fixing the Emacs manual

* doc/emacs/cmdargs.texi (Action Arguments): Rearrange text
describing what happens when Emacs is invoked with several file
arguments.  Suggested by Grant Rettke <gcr@wisdomandwonder.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/xresources.texi (GTK styles):
* doc/emacs/mini.texi (Passwords):
* doc/emacs/frames.texi (Scroll Bars): Use "cannot" instead of
"can not".

* doc/emacs/macos.texi (Mac / GNUstep Basics): Clarify the effect
of ns-right-alternate-modifier when its value is 'none'.
Suggested by Wanderson Ferreira <iagwanderson@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/calendar.texi (Importing Diary, Appointments): Now
sub-sections of Diary.
* doc/emacs/emacs.texi (Top):
* doc/emacs/calendar.texi (Diary): Adjust menus to the above
change.  Suggested by Isaac Carter <icarter1391@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/anti.texi (Antinews): Fix grammar.

Fix handling of modifier keys on macOS

* src/nsterm.m (keyDown:): Distinguish between shift-like and
control-like modifier keys.  Allow treating ⌘ as shift-like
modifier (e.g. for the Gujarati – QUERTY input method, where ⌘
switches to QUERTY.)

* lisp/cus-start.el (standard): Change nil to none for
ns-command-modifier; update description.

* etc/NEWS: Add NEWS entry.

* etc/NEWS: Expunge the solecism "allow(s)" + infinitive

Make tramp-archive fit for older Emacsen

* lisp/net/tramp-archive.el (tramp-archive-enabled)
(tramp-archive-file-name-handler-alist)
(tramp-archive-file-name-handler): Adapt docstring.
(tramp-register-archive-file-name-handler): Remove it from
`after-init-hook' when unloading.
(tramp-archive-gvfs-host): New defsubst.
(tramp-archive-dissect-file-name): Use it.

* lisp/net/tramp-cmds.el (tramp-cleanup-all-connections):
Check that `tramp-archive-enabled' is bound.

* test/lisp/net/tramp-archive-tests.el (tramp-archive-test42-auto-load):
Check also that tramp-archive is not loaded when Tramp is loaded.
(tramp-archive-test42-delay-load): Adapt test messages.

Two minor fixes in Antinews

* doc/emacs/anti.texi (Antinews): Two minor fixes.

* etc/NEWS: Rename image-dired-thumb-job-limit

to image-dired-queue-active-limit (bug#30279)

* lisp/simple.el (async-shell-command, shell-command): Fix grammar

Fix deferred display of async shell-command buffers

* lisp/simple.el (shell-command): Display async shell buffer on
process output for every, not just first, command invocation.  Check
buffer liveness, not name, before displaying. (bug#30213, bug#30280)

Mention remote file name completion in Emacs manual

* doc/emacs/mini.texi (Minibuffer File): Describe the behavior of
"//" with remote file names.  (Bug#29149)

Avoid EOVERFLOW problems with file-directory-p

This fixes a bug where (file-directory-p FOO) would fail if FOO
had an inode number out of range for ‘stat’.
* src/fileio.c (file_directory_p): Accept a Lisp string instead of
a C string.  All callers changed.  On non-MS-Windows hosts, use
openat with O_PATH|O_DIRECTORY if available, otherwise
file_accessible_directory_p unless it fails due to EACCESS,
otherwise stat.

Add tests to verify error propagation in 'json-insert'.

* test/src/json-tests.el (json-tests--error): New error symbol.
(json-insert/signal, json-insert/throw): New tests.

Don't require all file-attributes to be equal (Bug#30327)

* test/lisp/files-tests.el (files-tests-file-attributes-equal): New
function.
(files-tests-file-name-non-special-directory-files-and-attributes)
(files-tests-file-name-non-special-file-attributes): Use it instead of
`equal'.

* test/lisp/files-tests.el (files-tests--with-temp-non-special):

Expand `temporary-file-directory' by `file-truename', in case
it is located on a symlinked directory.  (Bug#30327)

Prevent loading tramp-archive when it cannot be used

* lisp/files.el (locate-dominating-file): Check, that FILE is
a directory when traversing the tree.

* lisp/net/tramp-archive.el (tramp-archive-enabled): New defvar.
(tramp-archive-file-name-regexp): Protect against errors.
(tramp-archive-file-name-handler)
(tramp-register-archive-file-name-handler): Use it.
(all) Call `tramp-register-archive-file-name-handler'.

* lisp/net/tramp.el (tramp-register-file-name-handlers):
Use `tramp-archive-enabled'.

* test/lisp/net/tramp-archive-tests.el (all):
Use `tramp-archive-enabled' instead of `tramp-gvfs-enabled'.
(tramp-archive--test-emacs27-p): New defun.
(tramp-archive-test42-auto-load): Skip for older Emacsen.
(tramp-archive-test42-delay-load): Skip for older Emacsen.
Test also behavior when `tramp-archive-enabled' is nil.

; Fix arglist doc of json parse functions

* src/json.c (Fjson_parse_string, Fjson_parse_buffer):
Fix "usage:" arglist doc.

Autoload tramp-archive

* doc/misc/tramp.texi (Archive file names): Do not require to
load Tramp explicitly, this is autoloaded now also for file archives.

* lisp/net/tramp-archive.el (tramp-archive-suffixes)
(tramp-archive-compression-suffixes): Autoload them.
(tramp-archive-autoload-file-name-regexp): New defmacro.
(tramp-archive-file-name-regexp): Use it.
(tramp-register-archive-file-name-handler): New defun.  Call
it in `after-init-hook'.

* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test40-file-system-info): Rename from
`tramp-archive-test40-archive-file-system-info.
(tramp-archive-test42-auto-load)
(tramp-archive-test42-delay-load): New tests.

Yest another round of manual copyedits

* doc/emacs/fixit.texi (Transpose, Spelling): Minor stylistic
changes.  Suggested by myq larson <myqlarson@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/calendar.texi (Appointments, Time Intervals): Mention
relevant Org features.  Suggested by Alex Branham
<alex.branham@gmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/dired.texi (Operating on Files)
(Shell Commands in Dired, Image-Dired): Minor stylistic edits.
Suggested by Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.

* doc/emacs/commands.texi (User Input): Explain "C-M-a".
Suggested by Martin Luethi <martin.luethi@geo.uzh.ch> in
emacs-manual-bugs@gnu.org.

Update xdisp.c commentary

* src/xdisp.c: Update commentary regarding "asynchronous" entry
into redisplay.  (Bug#30182)

Fix Bug#30324

* lisp/net/rlogin.el (rlogin, rlogin-directory-tracking-mode):
Adapt to changed remote file name syntax.  (Bug#30324)

Recognize Org as builtin package (bug#30310)

* lisp/org/org.el: Add Version header so detected as builtin package.
* test/lisp/org/org-tests.el: New file.

; * autogen.sh (check_version): Improve previous change.

Try to work around intermittent autogen failure on hydra.nixos.org

* autogen.sh (check_version): Try to handle odd systems where
/bin/sh does not define the "command" builtin.

; * autogen.sh: Remove temporary debug statements.

; * autogen.sh: Add some temporary debug statements.

; * autogen.sh: Remove temporary debug statements.

; * autogen.sh: Add some temporary debug statements.

* autogen.sh: Remove temporary debug statements.

* autogen.sh: Add some temporary debug statements, for hydra.nixos.org.

; Merge from emacs-26

4c8157cfe0 ; Let files-tests.el pass multiple times in a session
99251ab62e ; Avoid process kill query during term tests

; Let files-tests.el pass multiple times in a session

* test/lisp/files-tests.el (files-test-local-variables): Use `cl-letf'
instead of advice.  The advice was not being activated on the second
run.

; Avoid process kill query during term tests

* test/lisp/term-tests.el (term-test-screen-from-input): Just unset
the process query-on-exit flag to rather than trying to end the
process before the end of test (which is generally unreliable).

CC Mode: Fix an enum intro being parsed as defun-block-intro

* lisp/progmodes/cc-engine.el (c-inside-bracelist-p): Return a bufpos rather
than t for the enum case.
(c-add-stmt-syntax, c-guess-continued-construct): Replace
c-looking-at-or-maybe-in-bracelist by c-inside-bracelist-p, since the former
does not recognize enum brace lists, but the latter does.

* lisp/progmodes/cc-fonts.el (c-get-fontification-context): Replace
c-looking-at-or-maybe-in-bracelist by c-inside-bracelist-p.

Properly integrate modules into the loading process (Bug#30164).

* src/lread.c (Fload): Don't defer to module-load immediately when
encountering a module, but use the normal loading machinery to
properly set up load-history, check for recursive loads, print
messages, etc.

* test/src/emacs-module-tests.el (module/load-history): New test.
(module/describe-function-1): Adapt test.

* etc/NEWS: Mention fixed behavior.

Use 'defalias' in test module instead of 'fset'.

This puts functions defined in the module into the 'load-history'.

* test/data/emacs-module/mod-test.c (bind_function): Use 'defalias'
instead of 'fset'.

* test/src/emacs-module-tests.el (module/describe-function-1): Adapt
unit test.

Add support for module functions to C-h f (Bug#30163).

* lisp/help-fns.el (help-fns-function-description-header): Handle
module functions.

* test/src/emacs-module-tests.el (module/describe-function-1): New
test.

Handle quoted remote file names for file notifications

* lisp/filenotify.el (file-notify-add-watch): Do not suppress
other file name handlers when FILE is quoted.

* test/lisp/filenotify-tests.el
(file-notify-test-remote-temporary-file-directory):
Beware quoted `temporary-file-directory'.

* test/lisp/files-tests.el
(files-tests-file-name-non-special-quote-unquote): Improve test.

Minor tweaks in tramp-archive.el

* lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
Bind `tramp-unknown-id-integer' and `tramp-unknown-id-string'
in order to have minimal ownership information.

Merge from origin/emacs-26

6f495ab (origin/emacs-26) Another round of manual fixups
59344c4 * doc/lispref/customize.texi (Custom Themes): Clarify .el pre...
6386efc * doc/emacs/entering.texi (Entering Emacs): Another wording fix.
e21f018 * doc/lispref/functions.texi (Inline Functions): Fix typo (Bu...
1c2fb04 * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug...
b90e91c Fix last change of @key markup
f180075 * doc/emacs/entering.texi (Entering Emacs): Fix markup.

; Merge from origin/emacs-26

The following commits were skipped:

01932c8 Revert a1bbc49015 (Bug#30243), do not merge
855ae57 ; Auto-commit of loaddefs files.

Merge from origin/emacs-26

56c37bb Use @key{} where it is missing in the manuals
25c0198 Another round of manual fixes from proofreading

Another round of manual fixups

* doc/emacs/killing.texi (Killing by Lines): Clarify wording.
Reported by David Bonnafous <dbonnafo@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/windows.texi (Other Window): Improve wording.
Reported by Rasmus Sjostrom <ras.sjostrom@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/display.texi (Display Custom): Mention that line
numbers are not displayed in the minibuffer and tooltips.

* doc/emacs/mini.texi (Basic Minibuffer): Improve wording.
* doc/emacs/regs.texi (Registers): More comma removal.  Suggested
by "root@vxid.pw root@vxid.pw" <root@vxid.pw> in
emacs-manual-bugs@gnu.org.

* doc/emacs/display.texi (Auto Scrolling): Fix a typo.  Reported
by Kevin Foley <kfoley15@gmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/display.texi (Scrolling): Fix grammar.
(Horizontal Scrolling): Mention reasonable limits for hscroll-step
float values.  Suggested by Jerome Truong <jerometruong@gmail.com>
in emacs-manual-bugs@gnu.org.

* doc/emacs/mini.texi (Minibuffer Edit): Add a missing comma.
* doc/emacs/basic.texi (Position Info, Arguments, Repeating):
Remove redundant commas.  Suggested by oldgaro
<oldgaro@protonmail.com> in emacs-manual-bugs@gnu.org.

* doc/emacs/kmacro.texi (Save Keyboard Macro): Clarify wording.
Suggested by clemens.radermacher@posteo.de in
emacs-manual-bugs@gnu.org.

* doc/emacs/building.texi (Compilation Mode): Improve and simplify
wording.  Suggested by drone <yoorobot@gmail.com> in
emacs-manual-bugs@gnu.org.

* doc/emacs/dired.texi (Dired Enter): Clarify wording.
(Dired Deletion): Fix a typo.
(Marks vs Flags): Mention that M-DEL in Dired asks for the mark
character.  Fix typos.
* doc/emacs/basic.texi (Moving Point, Erasing, Basic Undo)
(Arguments): Some additional information about keys.  Reported by
Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.

* lisp/emacs-lisp/cconv.el (cconv-convert): Fix compiling compiled code

Don't conv-convert the docstring arg of defvar/defconst.

* doc/lispref/customize.texi (Custom Themes): Clarify .el preference.

Copyright-paperwork-exempt: yes

https://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00824.html.

Fix quoting in tramp-find-inline-compress for w32

* lisp/net/tramp-sh.el (tramp-find-inline-compress): Improve command
quoting for w32.  Reported by Chris Zheng <chriszheng99@gmail.com>.

* doc/emacs/entering.texi (Entering Emacs): Another wording fix.

Handle quoted file names in filenotify.el

* lisp/filenotify.el (file-notify-add-watch): Do not save
quoted file names in `file-notify-descriptors'.

* test/lisp/files-tests.el
(files-file-name-non-special-notify-handlers): Do not expect
to fail.

Use file-name-quote{,d-p} in files-tests.el

* test/lisp/files-tests.el
(files-tests-file-name-non-special-quote-unquote): New test.
(files-tests--file-name-non-special--subprocess): Simplify.
(files-tests--file-name-non-special--buffers)
(files-tests--with-temp-non-special)
(files-tests-file-name-non-special-directory-file-name)
(files-tests-file-name-non-special-file-in-directory-p)
(files-tests-file-name-non-special-file-name-all-completions)
(files-tests-file-name-non-special-file-name-as-directory)
(files-tests-file-name-non-special-file-name-completion)
(files-tests-file-name-non-special-file-name-directory)
(files-tests-file-name-non-special-find-backup-file-name)
(files-tests-file-name-non-special-make-nearby-temp-file):
Use `file-name-quote' and `file-name-quoted-p', respectively.

Test and fix "/:" quoted file name handlers (Bug#30243)

Some w32 specific problems were discovered, but only worked around, as
these are not serious, and not the focus of this bug fix:
    - The w32 implementation of `insert-directory doesn't handle a nil
    SWITCHES argument.
    - `dired-compress-file' does not operate correctly if the unquoted
    filename contains a ":" (e.g., C:/foo/bar).

* lisp/files.el (file-name-non-special): Strip the "/:" from
`default-directory' for `temporary-file-directory' operation; both
arguments to `file-name-completion', `file-name-all-completion', and
`file-equal-p' operations; `buffer-file-name' for
`make-auto-save-file-name' and 'set-visited-file-modtime' operations.
Don't touch any operands of `file-notify-rm-watch' and
`file-notify-valid-p' as they receive descriptors; not file
names (this is not sufficient to fix these operations for "/:" quoted
file names though, these are fixed in a later commit).

* test/lisp/files-tests.el (files-tests--with-temp-file): Give it a
`debug' property.
(files-tests--with-temp-non-special): New helper macro.
(files-tests--file-name-non-special--subprocess): Simplify.
(files-tests-file-name-non-special-quote-unquote)
(files-file-name-non-special-notify-handlers)
(files-file-name-non-special-handlers)
(files-tests-file-name-non-special-access-file)
(files-tests-file-name-non-special-add-name-to-file)
(files-tests-file-name-non-special-byte-compiler-base-file-name)
(files-tests-file-name-non-special-copy-directory)
(files-tests-file-name-non-special-copy-file)
(files-tests-file-name-non-special-delete-directory)
(files-tests-file-name-non-special-delete-file)
(files-tests-file-name-non-special-diff-latest-backup-file)
(files-tests-file-name-non-special-directory-file-name)
(files-tests-file-name-non-special-directory-files)
(files-tests-file-name-non-special-directory-files-and-attributes)
(files-tests-file-name-non-special-dired-uncache)
(files-tests-file-name-non-special-dired-compress-handler)
(files-tests-file-name-non-special-expand-file-name)
(files-tests-file-name-non-special-file-accessible-directory-p)
(files-tests-file-name-non-special-file-acl)
(files-tests-file-name-non-special-file-attributes)
(files-tests-file-name-non-special-file-directory-p)
(files-tests-file-name-non-special-file-equal-p)
(files-tests-file-name-non-special-file-executable-p)
(files-tests-file-name-non-special-file-exists-p)
(files-tests-file-name-non-special-file-in-directory-p)
(files-tests-file-name-non-special-file-local-copy)
(files-tests-file-name-non-special-file-modes)
(files-tests-file-name-non-special-file-name-all-completions)
(files-tests-file-name-non-special-file-name-as-directory)
(files-tests-file-name-non-special-file-name-case-insensitive-p)
(files-tests-file-name-non-special-file-name-completion)
(files-tests-file-name-non-special-file-name-directory)
(files-tests-file-name-non-special-file-name-nondirectory)
(files-tests-file-name-non-special-file-name-sans-versions)
(files-tests-file-name-non-special-file-newer-than-file-p)
(files-tests-file-name-non-special-file-ownership-preserved-p)
(files-tests-file-name-non-special-file-readable-p)
(files-tests-file-name-non-special-file-regular-p)
(files-tests-file-name-non-special-file-remote-p)
(files-tests-file-name-non-special-file-selinux-context)
(files-tests-file-name-non-special-file-symlink-p)
(files-tests-file-name-non-special-file-truename)
(files-tests-file-name-non-special-file-writable-p)
(files-tests-file-name-non-special-find-backup-file-name)
(files-tests-file-name-non-special-get-file-buffer)
(files-tests-file-name-non-special-insert-directory)
(files-tests-file-name-non-special-insert-file-contents)
(files-tests-file-name-non-special-load)
(files-tests-file-name-non-special-make-auto-save-file-name)
(files-tests-file-name-non-special-make-directory)
(files-tests-file-name-non-special-make-directory-internal)
(files-tests-file-name-non-special-make-nearby-temp-file)
(files-tests-file-name-non-special-make-symbolic-link)
(files-tests-file-name-non-special-rename-file)
(files-tests-file-name-non-special-set-file-acl)
(files-tests-file-name-non-special-set-file-modes)
(files-tests-file-name-non-special-set-file-selinux-context)
(files-tests-file-name-non-special-set-file-times)
(files-tests-file-name-non-special-set-visited-file-modtime)
(files-tests-file-name-non-special-shell-command)
(files-tests-file-name-non-special-start-file-process)
(files-tests-file-name-non-special-substitute-in-file-name)
(files-tests-file-name-non-special-temporary-file-directory)
(files-tests-file-name-non-special-unhandled-file-name-directory)
(files-tests-file-name-non-special-vc-registered)
(files-tests-file-name-non-special-write-region): New tests.

* doc/lispref/functions.texi (Inline Functions): Fix typo (Bug#30238).

* lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug#30294).

Fix last change of @key markup

* doc/lispref/display.texi (Specified Space):
* doc/emacs/programs.texi (C Modes):
* doc/emacs/killing.texi (Rectangles):
* doc/emacs/emacs.texi (Top):
* doc/emacs/display.texi (Useless Whitespace): Don't use @key
markup for characters and commands, only for keys.

* doc/emacs/entering.texi (Entering Emacs): Fix markup.

Update from gnulib

This includes:
2018-01-31 environ: Fix link error on 64-bit Cygwin
2018-01-27 Fix malfunction of socket functions on HP-UX in 64-bit mode
2018-01-26 manywarnings: fix maintainer comment
2018-01-23 Merge strftime.c changes from glibc
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/gnulib.mk.in, lib/nstrftime.c, lib/unistd.in.h, m4/extensions.m4:
* m4/manywarnings.m4: Update.

* src/xfns.c: Make some non-exported vars static.

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Adapt tramp-tests.el according to Bug#30243

* test/lisp/net/tramp-tests.el (tramp--test-emacs27-p): New defun.
(tramp-test11-copy-file, tramp-test12-rename-file)
(tramp-test21-file-links, tramp-test24-file-acl)
(tramp-test25-file-selinux, tramp--test-check-files): Use it.

Revert a1bbc49015 (Bug#30243), do not merge

* lisp/files.el:
* test/lisp/net/tramp-tests.el: Revert a1bbc49015.  (Bug#30243)

; Auto-commit of loaddefs files.

; Auto-commit of loaddefs files.

* lisp/files.el (get-free-disk-space): Wrap body with `save-match-data'.

Several `*-insert-directory' functions could fail otherwise.

* lisp/net/tramp-archive.el (tramp-archive-run-real-handler): New defun.

(tramp-archive-file-name-handler): Use it.

automerge: adjust meaning of -d option

* admin/automerge (nocd): New variable, replacing $dir.
(usage, -d): Option -d no longer takes an argument.

automerge: add option to work in specific directory

* admin/automerge (usage): Mention -d.
(dir): New variable.
(-d): New option.
(main): If requested, cd to specified directory.

Use @key{} where it is missing in the manuals

automerge: add option to start with a reset

* admin/automerge (usage): Mention -r.
(reset): New variable.
(-r): New option.
(main): If requested, do a reset and pull.

Another round of manual fixes from proofreading

* doc/emacs/search.texi (Incremental Search)
(Nonincremental Search): Mention the menu bar and fix typos.
Reported by David Bonnafous <dbonnafo@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/building.texi (Compilation): Improve wording.
Suggested by drone <yoorobot@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/kmacro.texi (Basic Keyboard Macro): Clarify text.
Suggested by Robert Pluim <rpluim@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/display.texi (Highlight Interactively, Fringes):
Improve wording.  Suggested by Justin Heyes-Jones
<justinhj@gmail.com> in emacs-manual-bugs@gnu.org.
* doc/emacs/commands.texi (User Input, Commands): Add missing
commas.
* doc/emacs/screen.texi (Menu Bar): Mention keyboard keys to
navigate menus.  Suggested by oldgaro <oldgaro@protonmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/search.texi (Not Exiting Isearch): Fix a typo.
Reported by "Kocken, I.J. (Ilja)" <I.J.Kocken@uu.nl> in
emacs-manual-bugs@gnu.org.
* doc/emacs/basic.texi (Inserting Text): Mention one more label of
RET.  Suggested by Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.
* doc/emacs/text.texi (Paragraphs): Clarify text.  Reported by
Marcin Borkowski <mbork@mbork.pl> in emacs-manual-bugs@gnu.org.
* doc/emacs/maintaining.texi (Introduction to VC)
(Why Version Control?, VCS Merging): Fix typos and section
capitalization.  Suggested by "R. P. Dillon"
<rpdillon@killring.org> in emacs-manual-bugs@gnu.org.
* doc/emacs/modes.texi (Major Modes, Choosing Modes): Fix typos.
Reported by clemens.radermacher@posteo.de in
emacs-manual-bugs@gnu.org.

Merge from origin/emacs-26

22922c7 (origin/emacs-26) * doc/emacs/entering.texi (Entering Emacs):...
59657c4 Document 'window-at-side-p' in the Elisp manual
2b35ed0 Document external-debugging-output in the Elisp Manual (Bug#2...
db6564c Fix scroll-margin docstring (Bug#13791)
732d1b9 Clarify that `ansi-term' is almost the same as `term' (Bug#18...
f706c59 Update manual description of locate-file (Bug#23650)
1602262 Clarify effect of print-gensym (Bug#27776)
53e9fa2 * lisp/custom.el (defcustom): Fix docstring (Bug#27891).
607cc4e Define cl-type-definition button type as needed (Bug#28899)
9e6889c Emphasize that GPG passphrase caching is temporary (Bug#29907)
4b5711b Fix @examples in cc-mode.info, where lines were getting glued...
71961f1 Minor change in "Mode Line" section of Emacs manual
55a2b76 More fixes in the Emacs manual

* doc/emacs/entering.texi (Entering Emacs): Fix last change.

Fix Bug#30293

* lisp/net/tramp-archive.el (tramp-archive-file-name-for-operation):
New defsubst.
(tramp-archive-file-name-archive, tramp-archive-file-name-localname):
New defuns.
(tramp-archive-file-name-handler, tramp-archive-dissect-file-name)
(tramp-archive-handle-not-implemented): Use them.  (Bug#30293)

* test/lisp/net/tramp-archive-tests.el (tramp-archive-test-directory):
New defconst.
(tramp-archive-test01-file-name-syntax): Extend test.
(tramp-archive-test05-expand-file-name-non-archive-directory):
New test.  (Bug#30293)

* test/lisp/net/tramp-archive-resources/foo.iso/foo: New file.

Document 'window-at-side-p' in the Elisp manual

* doc/lispref/windows.texi (Windows and Frames): Document
'window-at-side-p'.

Document external-debugging-output in the Elisp Manual (Bug#24051)

* doc/lispref/streams.texi (Output Streams): List
external-debugging-output.
* src/print.c (Fexternal_debugging_output): Quote `print' in
docstring.