Merge from origin/emacs-24

c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases

Conflicts:
	lisp/ChangeLog

3 files changed, 28 insertions, 53 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9c11e18fb69..cd5c54037c8 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,8 +1,7 @@
 2015-03-03  Kelvin White  <kwhite@gnu.org>
 
-        * NEWS: Add section to include ERC changes
+        * NEWS.24: Add section to include ERC changes.
 
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 2015-03-02  Daniel Colascione  <dancol@dancol.org>
 
         * NEWS: Mention finalizers.
diff --git a/etc/NEWS b/etc/NEWS
index 0e02fc7022c..ad8b6f27812 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -14,24 +14,21 @@ 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
 
 +++
-
 ** 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' 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
 December 2013.  If you are affected, please send a bug report.  You
@@ -39,41 +36,18 @@ should be able to work around the problem either by porting the Emacs
 undumping code to GCC under IRIX, or by configuring --with-wide-int,
 or by sticking with Emacs 24.4.
 
-** ERC
-
 ** 'configure' now prefers gnustep-config when configuring GNUstep.
 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).
@@ -86,8 +60,6 @@ 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
 
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index 969713a3393..7d9e1f0d83f 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -14,41 +14,45 @@ 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.
-
 
 * Changes in Emacs 24.5
 
----
+** This is mainly a bug-fix release, but there are some other changes.
+
 ** The default value of `history-length' has increased to 100.
 
-+++
-** `redisplay-dont-pause' is declared as obsolete.
+** The variable `redisplay-dont-pause' is obsolete.
 
 
 * Changes in Specialized Modes and Packages in Emacs 24.5
 
-** `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.
+
+** ERC
+
+*** 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
 
----
-*** crisp.el - moved to elpa.gnu.org.
+*** crisp.el (moved to elpa.gnu.org)
 
----
 *** 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.
 
----
 *** vi.el, vip.el (try M-x viper instead)