Merge from origin/emacs-25

b134c20 Sync with gnulib
bb30fa9 Fix last change on 2016-01-02
488a72f ; Spelling fixes
9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3
0e7bcec Avoid crashes due to unreasonably large or small text scaling
85f257c Improve documentation of 'with-eval-after-load'
668c7bc Improve handling of non-ASCII characters in Git log messages
b570769 Remove undefined behavior in OS X dumper.
97211f3 Fix clipping of xwidgets
e87fbc0 Improve Lisp-level documentation of tooltips
9f1786e Faces names should not end in "-face".
3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
a1f221b Comint and compile no longer set EMACS
5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2...
a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
c93ae7a Allow to customize names of executables used by grep.el
f6497c6 Set locale encoding to UTF-8 when run from OS X GUI.
7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
a3f1ac2 Avoid infinite loop in 'studlify-word'
f36df4b Don’t recommend obsolete EMACS env var
fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need...

diff --cc ChangeLog.2
Simple merge

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

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

diff --cc etc/NEWS
index 0152593de8fcd7771a716a71198b35134b8160e3,fe7df96ecea6beea86be215002a23122e0fe683d..59f8d0867178730def74e143ef3fd651e5bb3d91
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -1723,18 -1409,12 +1734,20 @@@ symbol-function was changed not to sign
  *** As a consequence, the second arg of 'indirect-function' is now obsolete.
  
  +++
- ** Although comint, term, and compile still set the EMACS variable,
- this is now considered deprecated and will be removed in a future release.
+ ** M-x shell and M-x compile no longer set the EMACS environment variable.
+ This avoids clashing when other programs use the variable for other purposes.
+ Although M-x term still sets EMACS for compatibility with Bash 4.3 and earlier,
+ this is deprecated and will be phased out when Bash 4.4 or later takes over.
  Use the INSIDE_EMACS environment variable instead.
  
 +** 'C-up', 'C-down', 'C-left' and 'C-right' are now defined in term
 +mode to send the same escape sequences that xterm does.  This makes
 +things like forward-word in readline work.
 +
 +---
 +** hideshow mode got four key bindings that are analogous to outline
 +mode bindings: 'C-c @ C-a',  'C-c @ C-t',  'C-c @ C-d', and 'C-c @ C-e.'
 +
  +++
  ** 'save-excursion' does not save&restore the mark any more.
  Use 'save-mark-and-excursion' if you want the old behavior.

diff --cc etc/PROBLEMS
Simple merge

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

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

diff --cc lisp/ffap.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/progmodes/grep.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/vc/vc-git.el
Simple merge

diff --cc lisp/vc/vc-hooks.el
Simple merge

diff --cc src/xsmfns.c
Simple merge