merge emacs-23

diff --cc lisp/ChangeLog
index b870299,22c92d3..4fc3a1f
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,42 -1,48 +1,87 @@@
 +2011-01-12  Kenichi Handa  <handa@m17n.org>
 +
 +      * mail/rmailmm.el (rmail-mime-next-item)
 +      (rmail-mime-previous-item): Delete them.
 +      (rmail-mime-shown-mode): Recursively call for children.
 +      (rmail-mime-hidden-mode): Delete the 2nd arg TOP.  Callers
 +      changed.
 +      (rmail-mime-raw-mode): Recursively call for children.
 +      (rmail-mode-map): Change mapping of tab and backtab to
 +      forward-button and backward-button respectively.
 +      (rmail-mime-insert-tagline): Always insert "Hide" or "Show"
 +      button.
 +      (rmail-mime-update-tagline): New function.
 +      (rmail-mime-insert-text): Call rmail-mime-update-tagline if the
 +      body display is changed.
 +      (rmail-mime-toggle-button): Renamed from rmail-mime-image.
 +      (rmail-mime-image): Delete this button type.
 +      (rmail-mime-toggle): New button type.
 +      (rmail-mime-insert-bulk): Call rmail-mime-update-tagline if the
 +      body display is changed.  Change the save button label to "Save".
 +      Don't process show/hide button here.
 +      (rmail-mime-insert-multipart): Call rmail-mime-update-tagline if
 +      the body display is changed.  Unconditionally call
 +      rmail-mime-insert for children.
 +      (rmail-mime-handle): Update `display' vector of the just inserted
 +      entity.
 +      (rmail-mime-process): If mail-header-parse-content-type returns
 +      nil, use "text/plain" as the fallback type.
 +      (rmail-mime-insert): For raw-mode, recursively call
 +      rmail-mim-insert for children.
 +      (rmail-mime): Handle the case that the current buffer is not rmail
 +      buffer (e.g. in summary buffer).
 +
 +2011-01-05  Kenichi Handa  <handa@m17n.org>
 +
 +      * mail/rmailmm.el (rmail-mime-next-item)
 +      (rmail-mime-previous-item): Skip the body of a non-multipart
 +      entity if a tagline is shown.
 +
+ 2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * tmm.el (tmm-get-keymap): Skip bindings without labels (bug#7721).
+       (tmm-prompt): Simplify.
+       (tmm-add-prompt): Remove unused var `win'.
+ 
+       * whitespace.el (global-whitespace-newline-mode): Fix call (bug#7810)
+       to minor mode which used nil accidentally to mean "turn off".
+ 
+ 2011-01-10  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-find-inline-compress)
+       (tramp-get-inline-coding): Quote command after pipe symbol for
+       local calls under W32.  (Bug#6784)
+ 
+ 2011-01-10  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-default-method): Initialize with pscp/plink
+       only when running under W32.
+ 
+ 2011-01-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * progmodes/grep.el (grep-compute-defaults): Quote the program
+       file name after the pipe symbol in Grep templates.  (Bug#6784)
+       * jka-compr.el (jka-compr-partial-uncompress): Likewise.
+ 
+ 2011-01-08  Lennart Borgman  <lennart.borgman@gmail.com>
+ 
+       * buff-menu.el (Buffer-menu-buffer-list): New var.
+       (Buffer-menu-revert-function, list-buffers-noselect): Use it, so a
+       restricted buffer list is not lost on revert (Bug#7749).
+ 
+ 2011-01-08  Eric Hanchrow  <eric.hanchrow@gmail.com>
+ 
+       * net/ldap.el (ldap-search-internal): Discard stderr output.
+ 
+ 2011-01-07  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * files.el (directory-abbrev-alist): Doc fix.  (Bug#7777)
+ 
+ 2011-01-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
+       Author names can have spaces (bug#7792).
+ 
  2011-01-04  Kenichi Handa  <handa@m17n.org>
  
        * mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown