Merge from emacs-24 branch

diff --cc doc/emacs/ChangeLog
index 156f59471f6c421d9c80fdb3715e345e0e57fb63,18428c0ba48bb746002c53ad1b65d186e24b7795..63ccb880d409938d63f4f7e7dd77c3ea41f8afde
--- 1/doc/emacs/ChangeLog
--- 2/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,4 -1,38 +1,38 @@@
 -2012-04-14  Glenn Morris  <rgm@gnu.org>
+ 2012-04-15  Chong Yidong  <cyd@gnu.org>
+ 
+       * misc.texi (emacsclient Options): More clarifications.
+ 
 -2012-04-14  Chong Yidong  <cyd@gnu.org>
++2012-04-15  Glenn Morris  <rgm@gnu.org>
+ 
+       * msdog.texi (Windows Printing): It doesn't set printer-name.
+ 
+       * mule.texi (Language Environments): Move font info to "Fontsets".
+       (Fontsets): Move intlfonts etc here from "Language Environments".
+       Copyedits.
+       (Defining Fontsets, Modifying Fontsets, Undisplayable Characters)
+       (Unibyte Mode, Charsets, Bidirectional Editing): Copyedits.
+ 
 -2012-04-14  Glenn Morris  <rgm@gnu.org>
++2012-04-15  Chong Yidong  <cyd@gnu.org>
+ 
+       * glossary.texi (Glossary): Standardize on "text terminal"
+       terminology.  All callers changed.
+ 
+       * misc.texi (emacsclient Options): Document "client frame" concept
+       and its effect on C-x C-c more carefully.
+ 
 -2012-04-13  Glenn Morris  <rgm@gnu.org>
++2012-04-15  Glenn Morris  <rgm@gnu.org>
+ 
+       * frames.texi (Scroll Bars):
+       * glossary.texi (Glossary): Use consistent case for "X Window System".
+ 
+       * mule.texi (Select Input Method, Coding Systems):
+       State command names in kbd tables.
+       (Recognize Coding): Add cross-ref.
+       (Output Coding): Don't mention message mode in particular.
+       (Text Coding, Communication Coding, File Name Coding, Terminal Coding):
+       Copyedits.
+ 
 +2012-04-14  Glenn Morris  <rgm@gnu.org>
  
        * mule.texi (Select Input Method, Coding Systems, Recognize Coding):
        Copyedits.

diff --cc doc/emacs/ack.texi
Simple merge

diff --cc doc/lispref/ChangeLog
index 6b3aba6d7991e182310c2d18c841c1f7a613fd37,74c32ccb7bbc0bf09919ffc3801d3bd01658668f..b5a25cb1c5170dc1aea0a04daa4cadf77569a6ae
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,24 +1,24 @@@
 -2012-04-14  Glenn Morris  <rgm@gnu.org>
+ 2012-04-15  Glenn Morris  <rgm@gnu.org>
+ 
+       * processes.texi (Processes, Subprocess Creation, Shell Arguments):
+       (Synchronous Processes, Asynchronous Processes, Deleting Processes):
+       Copyedits.
+       (Subprocess Creation): Discourage modifying exec-path directly.
+       (Synchronous Processes, Asynchronous Processes):
+       Update some example output.
+       (Process Information): Fix typo.
+       (Bindat Spec): Use Texinfo-recommended form of quote+punctuation.
+ 
 -2012-04-13  Chong Yidong  <cyd@gnu.org>
++2012-04-15  Glenn Morris  <rgm@gnu.org>
+ 
+       * anti.texi (Antinews): Copyedits.  Don't @dfn anything here.
+       open-network-stream does exist in Emacs 23, but is simpler.
+ 
 -2012-04-12  Chong Yidong  <cyd@gnu.org>
++2012-04-15  Chong Yidong  <cyd@gnu.org>
+ 
+       * customize.texi (Custom Themes): Also document load-theme etc.
+ 
 +2012-04-14  Chong Yidong  <cyd@gnu.org>
  
        * customize.texi (Applying Customizations):
        (Custom Themes): New nodes.

diff --cc doc/lispref/processes.texi
Simple merge

diff --cc lisp/ChangeLog
index 3d935d5b01fdc54b499d7a41c3d233f78020f24e,8c9f5b9f035a85f7c1fd51c31ede91aa93eb2031..b2a3f135109fb1ec1042940215f17eb6bfe226d4
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,43 -1,17 +1,56 @@@
 -2012-04-14  Glenn Morris  <rgm@gnu.org>
++2012-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
++
++      Avoid the use of ((lambda ...) ...) in lexical-binding code.
++      * emacs-lisp/easy-mmode.el (define-minor-mode):Use funcall (bug#11241).
++
+ 2012-04-15  Glenn Morris  <rgm@gnu.org>
+ 
+       * simple.el (process-file-side-effects): Doc fix.
+ 
++2012-04-15  Glenn Morris  <rgm@gnu.org>
+ 
+       * international/mule-cmds.el (set-language-environment): Doc fix.
+ 
 +2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * server.el (server-auth-key, server-generate-key): Doc fixes.
 +      (server-get-auth-key): Doc fix.  Use `string-match-p'.
 +      (server-start): Reflow docstring.
 +
 +2012-04-14  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * server.el (server-generate-key): `called-interactively-p'
 +      requires a parameter.
 +
 +2012-04-14  Michal Nazarewicz  <mina86@mina86.com>
 +
 +      * server.el (server-auth-key): New variable.
 +      (server-generate-key, server-get-auth-key): New function.
 +      (server-start): Use the new variable and functions to allow
 +      setting a permanent server key (bug#9423).
 +
 +2012-04-14  Leo Liu  <sdl.web@gmail.com>
 +
 +      * vc/diff-mode.el (diff-file-prev/next): Fix typo.
 +
 +2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Spelling fixes.
 +      * hexl.el (hexl-rulerize): Rename from hexl-rulerise, since
 +      Emacs uses American spelling.
 +
 +2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * emacs-lock.el (emacs-lock-locked-buffer-functions): New hook.
 +      (emacs-lock--exit-locked-buffer): Return the locked buffer.  Doc fix.
 +      (emacs-lock--kill-emacs-hook, emacs-lock--kill-emacs-query-functions)
 +      (emacs-lock--kill-buffer-query-functions): Run new hook.  (Bug#11017)
 +
  2012-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -      Avoid the use of ((lambda ...) ...) in lexical-binding code.
 -      * emacs-lisp/easy-mmode.el (define-minor-mode):Use funcall (bug#11241).
 +      * progmodes/which-func.el (which-func-modes): Change default.
  
 -2012-04-13  Kim F. Storm  <storm@cua.dk>
 +2012-04-14  Kim F. Storm  <storm@cua.dk>
  
        * emulation/cua-base.el (cua-exchange-point-and-mark): Just call
        exchange-point-and-mark if cua-enable-cua-keys is nil (Bug#11191).

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/simple.el
Simple merge