merge emacs-23

diff --cc lisp/ChangeLog
index 65b4ec8d400e65d36e9831a83aa753e5fa95e5ff,e0c9f552c9fb5957a331cbb4a90433b26cf8a522..dd29de7e783e377d143a4c153e55655376b2622f
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,31 +1,36 @@@
 +2011-02-21  Kenichi Handa  <handa@m17n.org>
 +
 +      * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
 +      header components.
 +
+ 2011-02-19  Kenichi Handa  <handa@m17n.org>
+ 
+       * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to
+       get the header copy into the temporary buffer.
+       (rmail-mime-insert-decoded-text): Ignore us-ascii.
+       (rmail-show-mime): When rmail-mime-coding-system is nil, set
+       buffer-file-coding-system to undecided.
+ 
+ 2011-02-18  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * image-mode.el (image-toggle-display-image): Disable
+       require-final-newline in buffers visiting binary image files.
+       (Bug#8047)
+ 
+       * international/mule-cmds.el (read-char-by-name, ucs-insert):
+       Document completion with asterisk and a substring.
+ 
+ 2011-02-18  Glenn Morris  <rgm@gnu.org>
+ 
+       * files.el (find-file-literally): Doc fix.
+ 
+ 2011-02-17  Glenn Morris  <rgm@gnu.org>
+ 
+       * simple.el (rfc822-goto-eoh): Give it a doc-string.
+ 
+       * log-edit.el (log-edit-insert-changelog):
+       Fix `log-edit-strip-single-file-name' functionality.  (Bug#8057)
+ 
  2011-02-14  Chong Yidong  <cyd@stupidchicken.com>
  
        * pgg-gpg.el (pgg-gpg-process-region): Bind

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc src/ChangeLog
index 6b3c5bc3ab4a7cc95e0e7cb20d2e3be2c8e0ce0c,3a356bb81aa06707476a5da52078225fff528a9f..26da194f22850f2a1c128674ffb2a0b1c42efd86
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
+ 2011-02-19  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
+ 
 +2011-02-17  Kenichi Handa  <handa@m17n.org>
 +
 +      * font.c (font_open_entity): Be sure to set scaled_pixel_size.
 +      (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
 +      integer.
 +
  2011-02-13  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (redisplay_internal): Resynchronize `w' if the selected