Merge changes from emacs-23 branch.

diff --cc lisp/ChangeLog
index ed11b1c19b164eaf6a4fd3a1c8a31adecc5e40cc,4d04453791ab279dd73435e3d059d1e9ae448b65..8d9a1a46bf624ecb65f94512e32cdc44fd78b718
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,6 -1,6 +1,25 @@@
++2010-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
++
++      * repeat.el (repeat): Use read-key (bug#6256).
++
++2010-10-19  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-19  Stefan Monnier  <monnier@iro.umontreal.ca>
++
++      * minibuffer.el (completion--replace): Move point where it belongs
++      when there's a common suffix (bug#7215).
++
++2010-10-19  Kenichi Handa  <handa@m17n.org>
++
++      * international/characters.el: Add category '|' (word breakable)
++      to fullwidth characters.
++
  2010-10-19  Michael Albinus  <michael.albinus@gmx.de>
  
 -      * net/tramp.el (tramp-do-file-attributes-with-stat)
 +      * net/tramp-sh.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>.

diff --cc lisp/emacs-lisp/regexp-opt.el
Simple merge

diff --cc lisp/minibuffer.el
index 98380f3926e13e4e541dba701a881c7e6b3453bb,bc5a1d2e8071c114d10b74a044960a042c1e9810..ee1fcae3119a8a543c5dfa4e33acc2ff7b3d84fd
--- 1/lisp/minibuffer.el
--- 2/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@@ -508,23 -498,12 +508,24 @@@ Moves point to the end of the new text.
        (setq suffix-len (1+ suffix-len)))
      (unless (zerop suffix-len)
        (setq end (- end suffix-len))
-       (setq newtext (substring newtext 0 (- suffix-len)))))
-   (goto-char beg)
-   (insert newtext)
-   (delete-region (point) (+ (point) (- end beg))))
+       (setq newtext (substring newtext 0 (- suffix-len))))
+     (goto-char beg)
+     (insert newtext)
+     (delete-region (point) (+ (point) (- end beg)))
+     (forward-char suffix-len)))
  
 +(defcustom completion-cycle-threshold nil
 +  "Number of completion candidates below which cycling is used.
 +Depending on this setting `minibuffer-complete' may use cycling,
 +like `minibuffer-force-complete'.
 +If nil, cycling is never used.
 +If t, cycling is always used.
 +If an integer, cycling is used as soon as there are fewer completion
 +candidates than this number."
 +  :type '(choice (const :tag "No cycling" nil)
 +          (const :tag "Always cycle" t)
 +          (integer :tag "Threshold")))
 +
  (defun completion--do-completion (&optional try-completion-function)
    "Do the completion and return a summary of what happened.
  M = completion was performed, the text was Modified.

diff --cc lisp/repeat.el
Simple merge

diff --cc src/ChangeLog
index 7046d13262fb0ed4b06591e79aaaf41f69177e05,d33f9dd4f0b0948e563415f0ccd70e76e0a2c4e2..c9d0e80c12f5c622789857bdc28a25aadabf1332
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,28 -1,17 +1,41 @@@
 -2010-10-18  Ken Brown  <kbrown@cornell.edu>
++2010-10-19  Ken Brown  <kbrown@cornell.edu>
+ 
+       * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225).
+ 
 -2010-10-15  Kenichi Handa  <handa@m17n.org>
++2010-10-19  Kenichi Handa  <handa@m17n.org>
+ 
+       Fix incorrect font metrics when the same font is opened with
+       different pixelsizes.
+ 
+       * xftfont.c: Include composite.h.
+       (xftfont_shape): New function.
+       (syms_of_xftfont): Set xftfont_driver.shape.
+ 
 -2010-10-13  Damyan Pepper  <damyanp@gmail.com>
 +2010-10-18  Julien Danjou  <julien@danjou.info>
 +
 +      * frame.c (Fframe_pointer_visible_p):
 +      Add `frame-pointer-visible-p' to get the pointer visibility.
 +
 +2010-10-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnutls.c (emacs_gnutls_read): Return 0 if we get a
 +      non-"EAGAIN"-like error to signal to Emacs that the socket should
 +      be closed.
 +
 +2010-10-15  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * unexcoff.c (make_hdr): Fix prototype according to changes in
 +      2010-10-03T13:59:56Z!dann@ics.uci.edu.
 +
 +      * image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
 +
 +2010-10-15  Tassilo Horn  <tassilo@member.fsf.org>
 +
 +      * Makefile.in (really-oldXMenu): Fix typo in variable name that
 +      made building the X menu fail.
 +      (really-oldXMenu): Fix my previous fix.
 +
 +2010-10-14  Damyan Pepper  <damyanp@gmail.com>
  
        Fix handling of font properties on Windows (bug#6303).
        * font.c (font_filter_properties): New function, refactored from

diff --cc src/s/cygwin.h
index 4d58542e660888ff39d0a34e7660a443d7af9d23,dcab55a91e1cf91981c0009d941176dd0f52a8ca..157ef72f550d5a49348bb4e31357799a3e5d6e1c
--- 1/src/s/cygwin.h
--- 2/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@@ -101,5 -132,10 +101,8 @@@ along with GNU Emacs.  If not, see <htt
     returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
  #define G_SLICE_ALWAYS_MALLOC
  
 -/* the end */
 -
+ /* Send signals to subprocesses by "typing" special chars at them.  */
+ #define SIGNALS_VIA_CHARACTERS
+ 
  /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
     (do not change this comment) */

diff --cc src/xftfont.c
index dc82c28b215a68934d1f8b86a8f92516b476b39f,71fd1475280204d1cf2554dd7c0b8cf2dc68c35f..a44921a11df4881d56b56f3aa40b44062e772ec0
--- 1/src/xftfont.c
--- 2/src/xftfont.c
+++ b/src/xftfont.c
@@@ -664,8 -703,26 +665,25 @@@ xftfont_draw (struct glyph_string *s, i
    return len;
  }
  
+ Lisp_Object
+ xftfont_shape (Lisp_Object lgstring)
+ {
+   struct font *font;
+   struct xftfont_info *xftfont_info;
+   FT_Face ft_face;
+   Lisp_Object val;
+ 
+   CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring), font);
+   xftfont_info = (struct xftfont_info *) font;
+   ft_face = XftLockFace (xftfont_info->xftfont);
+   xftfont_info->ft_size = ft_face->size;
+   val = ftfont_driver.shape (lgstring);
+   XftUnlockFace (xftfont_info->xftfont);
+   return val;
+ }
+ 
  static int
 -xftfont_end_for_frame (f)
 -     FRAME_PTR f;
 +xftfont_end_for_frame (FRAME_PTR f)
  {
    XftDraw *xft_draw;