upstream

2 files changed, 48 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1d7438b6506..410332037d0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150)
+        * NEWS: Document these changes.
+
+2012-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Fix typo.
+
 2012-07-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify export of symbols to GDB.
diff --git a/etc/NEWS b/etc/NEWS
index ce44a530e26..93da6f7dccf 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -147,6 +147,10 @@ for it.
 
 * Editing Changes in Emacs 24.2
 
+** New option `delete-trailing-lines' specifies whether the M-x
+delete-trailing-whitespace command should delete trailing lines at the
+end of the buffer.  It defaults to t.
+
 ** Search changes
 
 *** Global `M-s _' starts a symbol (identifier) incremental search,
@@ -356,6 +360,12 @@ channel keys found, if any.
 if the command ends in `;' (when operating on multiple files).
 Otherwise, it executes the command on each file in parallel.
 
+** Shell
+
+*** New option `async-shell-command-buffer' specifies what buffer to use
+for a new asynchronous shell command when the default output buffer
+`*Async Shell Command*' is already taken by another running command.
+
 ** FFAP
 
 *** The option `ffap-url-unwrap-remote' can now be a list of strings,
@@ -489,6 +499,35 @@ third argument is a frame (that usage was obsolete since Emacs 22.2).
 but keywords or keyword-string pairs.  The old argument list will
 still be supported for Emacs 24.x.
 
+** Spelling changes.
+Some Lisp symbols have been renamed to avoid problems with spelling
+that is incorrect or inconsistent with how Emacs normally spells a word.
+
+*** Renamed functions
+
+**** hangul-input-method-inactivate -> hangul-input-method-deactivate
+**** inactivate-input-method -> deactivate-input-method
+**** quail-inactivate -> quail-deactivate
+**** robin-inactivate -> robin-deactivate
+**** viper-inactivate-input-method -> viper-deactivate-input-method
+**** viper-inactivate-input-method-action ->
+     viper-deactivate-input-method-action
+**** ucs-input-inactivate -> ucs-input-deactivate
+
+*** Renamed hooks
+The old hooks are still supported for backward compatibility, but they
+are deprecated and will be removed eventually.
+
+**** input-method-inactivate-hook -> input-method-deactivate-hook
+**** robin-inactivate-hook -> robin-deactivate-hook
+**** quail-inactivate-hook -> quail-deactivate-hook
+
+*** Renamed Lisp variables
+
+**** follow-deactive-menu -> follow-inactive-menu
+**** inactivate-current-input-method-function ->
+     deactivate-current-input-method-function
+
 ** The following obsolete variables and varaliases have been removed:
 
 *** `facemenu-unlisted-faces'