auto upstream

2 files changed, 18 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2b7534dc1e7..0dd27a1c0c0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-18  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Mention new key ? for describe-prefix-bindings.
+
 2013-04-15  Christopher Schmidt  <christopher@ch.ristopher.com>
 
         * NEWS: Mention separation of package descriptor and name of
diff --git a/etc/NEWS b/etc/NEWS
index 0830a7be469..8f64aa6e7ee 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -37,6 +37,8 @@ It is no longer needed, as the crt*.o files are no longer linked specially.
 
 * Changes in Emacs 24.4
 
+** Key ? also describes prefix bindings like C-h.
+
 +++
 ** `apropos-variable' is now `apropos-user-option'
 `apropos-user-option' shows all user options while `apropos-variable'
@@ -323,7 +325,18 @@ file using `set-file-extended-attributes'.
 
 * Lisp Changes in Emacs 24.4
 
-** `dont-compile' is declared obsolete.
+** Obsoleted functions:
+*** `dont-compile'
+*** `lisp-complete-symbol'
+*** `field-complete'
+*** `minibuffer-completion-contents'
+
+** `with-wrapper-hook' is obsoleted by `add-function'.
+The few hooks that used with-wrapper-hook are replaced as follows:
+*** `abbrev-expand-function' obsoletes `abbrev-expand-functions'.
+*** `completion-in-region-function' obsoletes `completion-in-region-functions'.
+*** `filter-buffer-substring-function' obsoletes `filter-buffer-substring-functions'.
+
 
 ** `get-upcase-table' is obsoleted by the new `case-table-get-table'.