Merge from origin/emacs-26

7668717d6f Merge from Gnulib
9e4d523427 * lisp/epg.el (epg-start-sign): Replace obsolete functions.
26c58f31a8 Small fix for erc-logging-enabled
34b41e3bc6 Quieten semantic normal usage
e25f961e37 Avoid irrelevant hyperlink in doc string of 'epa-pinentry-...
ec2636513c * doc/misc/tramp.texi (Remote processes): Mention gdb rest...
918a052a42 Query background for gnome terminal version 3.22 (Bug#29716)
1dfc27576a Make pixel-wise scrolling less laggy
f92264fc2a Fix child frame placement issues (bug#29953)
a5f718c4c5 ; * doc/lispref/text.texi (Change Hooks): Fix last change.
e876f5f9fb Describe the precise interaction of complex primitives wit...
3a22097cf6 Fix valgrind report in call-interactively
d5f1c87bfe * src/editfns.c (Fsave_excursion): Doc fix.  (Bug#30001)
b8d74c4578 Fix mark-defun when there's no spaces between successive d...
a377c652b5 Fix Dired display and operations on file names with raw bytes
d9d6e8a04c ; Comments related to src/termcap.c
f8a07fa6b1 Improve documentation of 'gdb-many-windows'
f82400798e Fix failures in smerge-mode on MS-Windows

diff --cc build-aux/config.guess
index 770cb5c7eb04466a6d1d1ccf979ebe4ff72ddf50,588fe82a42aa7014df8c77615d9efb0cdd881506..ba28704cd613154fe5d2885aaf4b4986bffc0475
--- 1/build-aux/config.guess
--- 2/build-aux/config.guess
+++ b/build-aux/config.guess
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  # Attempt to guess a canonical system name.
 -#   Copyright 1992-2018 Free Software Foundation, Inc.
 +#   Copyright 1992-2017 Free Software Foundation, Inc.
  
- timestamp='2017-12-17'
+ timestamp='2018-01-01'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by

diff --cc build-aux/config.sub
index 4fa505b51aaab34849ee239a319264c3ececc701,f2632cd8a2be180cc957624e84044347eba9e263..a2ff1fb0565f00a857042ff74fe3b49890227466
--- 1/build-aux/config.sub
--- 2/build-aux/config.sub
+++ b/build-aux/config.sub
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  # Configuration validation subroutine script.
 -#   Copyright 1992-2018 Free Software Foundation, Inc.
 +#   Copyright 1992-2017 Free Software Foundation, Inc.
  
- timestamp='2017-11-23'
+ timestamp='2018-01-01'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by

diff --cc doc/lispref/text.texi
Simple merge

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc lisp/cedet/semantic/lex.el
Simple merge

diff --cc lisp/emacs-lisp/lisp.el
Simple merge

diff --cc lisp/epa.el
Simple merge

diff --cc lisp/erc/erc-log.el
Simple merge

diff --cc lisp/term/xterm.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/callint.c
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/nsterm.h
Simple merge

diff --cc src/nsterm.m
Simple merge