Merge from origin/emacs-24

f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog

1 files changed, 14 insertions, 15 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 8509cc0030f..0e02fc7022c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -14,13 +14,6 @@ and NEWS.1-17 for changes in older Emacs versions.
 You can narrow news to a specific version by calling `view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
-Temporary note:
-+++ indicates that all necessary documentation updates are complete.
-    (This means all relevant manuals in doc/ AND lisp doc-strings.)
---- means no change in the manuals is needed.
-When you add a new item, use the appropriate mark if you are sure it applies,
-otherwise leave it unmarked.
-
 
 * Installation Changes in Emacs 25.1
 
@@ -28,13 +21,16 @@ otherwise leave it unmarked.
 
 ** Building Emacs now requires C99 or later.
 
+** The default value of `history-length' has increased to 100.
+
 ** The variable `redisplay-dont-pause' is obsolete.
 
 ** Building Emacs now requires GNU make, version 3.81 or later.
 
-+++
-** `call-process-shell-command' and `process-file-shell-command'
-don't take "&rest args" any more.
+** `call-process-shell-command' and `process-file-shell-command' no longer
+take "&rest args".
+
+** The option `browse-url-firefox-startup-arguments' no longer has an effect.
 
 ** By default, Emacs no longer works on IRIX.  We expect that Emacs
 users are not affected by this, as SGI stopped supporting IRIX in
@@ -51,32 +47,33 @@ If gnustep-config is not available, the old heuristics are used.
 +++
 *** New option `erc-rename-buffers'.
 
----
 *** New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'.
 
-+++
 *** `erc-format-@nick' displays all user modes instead of only op and voice.
 
----
 *** The display of irc commands in the current buffer has been disabled.
 
----
 *** `erc-version' now follows the Emacs version.
 
 ** Obsolete packages
 
----
 *** cc-compat.el
 
 ---
 ** The configure option `--with-pkg-config-prog' has been removed.
 Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 
+*** crisp.el (moved to elpa.gnu.org)
+
 ** The configure option '--enable-silent-rules' is now the default,
 and silent rules are now quieter.  To get the old behavior where
 'make' chatters a lot, configure with '--disable-silent-rules' or
 build with 'make V=1'.
 
+*** tpu-edt.el, ws-mode.el
+These emulations of old editors are believed to be no longer relevant
+ - contact emacs-devel@gnu.org if you disagree.
+
 ---
 ** The configure option '--with-gameuser' now allows to specify a
 group instead of a user if its argument is prefixed by ':' (a colon).
@@ -89,6 +86,8 @@ be installed setgid.  The option now defaults to the 'games' group.
 It has no particular connection to Emacs and has not changed in years,
 so if you want to use it, you can always take a copy from an older Emacs.
 
+*** vi.el, vip.el (try M-x viper instead)
+
 
 * Startup Changes in Emacs 25.1