merge emacs-23

diff --cc lisp/ChangeLog
index b819234,065895a..358c674
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,33 +1,38 @@@
 +2010-10-20  Kenichi Handa  <handa@m17n.org>
 +
 +      * face-remap.el (text-scale-adjust): Call read-event with a proper
 +      prompt.
 +
+ 2010-10-19  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-do-file-attributes-with-stat)
+       (tramp-do-directory-files-and-attributes-with-stat): Use "e0" in
+       order to make stat results a float.  Patch by Andreas Schwab
+       <schwab@linux-m68k.org>.
+ 
+ 2010-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * repeat.el (repeat): Use read-key (bug#6256).
+ 
+ 2010-10-18  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * emacs-lisp/unsafep.el: Don't mark functions that display
+       messages as safe.  Suggested by Johan Bockgård.
+ 
+ 2010-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/regexp-opt.el (regexp-opt-group, regexp-opt-charset):
+       Turn comments into docstrings.
+ 
+       * minibuffer.el (completion--replace): Move point where it belongs
+       when there's a common suffix (bug#7215).
+ 
+ 2010-10-15  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-open-connection-setup-interactive-shell):
+       Suppress expansion of tabs to spaces.  Reported by Dale Sedivec
+       <dale@codefu.org>.
+ 
  2010-10-15  Kenichi Handa  <handa@m17n.org>
  
        * international/characters.el: Add category '|' (word breakable)