merge master, fix conflicts

3 files changed, 27 insertions, 9 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index c72c560ec9c..20f88bdecc3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Default to 'configure --enable-silent-rules'
+        * NEWS: Document this.
+
+2015-01-10  Daniel Colascione  <dancol@dancol.org>
+
+        * NEWS: Fix typo
+
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         batch write-region no longer says "Wrote FOO"
diff --git a/etc/NEWS b/etc/NEWS
index ac42a9ff6dc..b3267e1ce60 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -40,8 +40,10 @@ or by sticking with Emacs 24.4.
 ** The configure option `--with-pkg-config-prog' has been removed.
 Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 
-** The configure option '--enable-silent-rules' and the command
-'make V=0' now do a better job of suppressing chatter.
+** 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'.
 
 ---
 ** The `grep-changelog' script (and its manual page) are no longer included.
@@ -141,10 +143,6 @@ this has no effect.
 ** A new text property `inhibit-read-only' can be used in read-only
 buffers to allow certain parts of the text to be writable.
 
-** A new function `file-tree-walk' allows to apply a certain action
-to all the files and subdirectories of a directory, similarly to the C
-library function `ftw'.
-
 ** A new function `directory-files-recursively' returns all matching
 files (recursively) under a directory.
 
@@ -166,6 +164,8 @@ characters, which can be used for geometry-related calculations.
 
 * Editing Changes in Emacs 25.1
 
+** Unicode names entered via C-x 8 RET now use substring completion by default.
+
 ** New minor mode global-eldoc-mode is enabled by default.
 
 ** Emacs now supports "bracketed paste mode" when running on a terminal
@@ -191,10 +191,16 @@ Unicode standards.
 
 When you invoke `shell' interactively, the *shell* buffer will now
 display in a new window.  However, you can customize this behavior via
-the new `shell-display-buffer-actions' variable.  For example, to get
+the `display-buffer-alist' variable.  For example, to get
 the old behavior -- *shell* buffer displays in current window -- use
-(setq shell-display-buffer-actions '(display-buffer-same-window)).
+(add-to-list 'display-buffer-alist
+     '("^\\*shell\\*$" . (display-buffer-same-window))).
+
 
+** EIEIO
+*** The <class>-list-p and <class>-child-p functions are declared obsolete.
+*** The <class> variables are declared obsolete.
+*** The <initarg> variables are declared obsolete.
 ** ido
 *** New command `ido-bury-buffer-at-head' bound to C-S-b
 Bury the buffer at the head of `ido-matches', analogous to how C-k
@@ -607,7 +613,7 @@ Horizontal scroll bars are turned off by default.
     `scroll-bar-height'.
 
 +++
-** The height of a frame's menu and tool bar are no more counted in the
+** The height of a frame's menu and tool bar are no longer counted in the
 frame's text height.  This means that the text height stands only for
 the height of the frame's root window plus that of the echo area (if
 present).  This was already the behavior for frames with external tool
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index c33b337a1e1..ae0d402a3d5 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -27,6 +27,9 @@ otherwise leave it unmarked.
 ---
 ** The default value of `history-length' has increased to 100.
 
++++
+** `redisplay-dont-pause' is declared as obsolete.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.5