From: Juanma Barranquero Date: Tue, 19 Oct 2010 11:44:07 +0000 (+0200) Subject: Merge changes from emacs-23 branch. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~564 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca3fa30248b923c17c021c0fcdb945271d14e8c2;p=emacs.git Merge changes from emacs-23 branch. --- ca3fa30248b923c17c021c0fcdb945271d14e8c2 diff --cc lisp/ChangeLog index ed11b1c19b1,4d04453791a..8d9a1a46bf6 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,6 -1,6 +1,25 @@@ ++2010-10-19 Stefan Monnier ++ ++ * repeat.el (repeat): Use read-key (bug#6256). ++ ++2010-10-19 Chong Yidong ++ ++ * emacs-lisp/unsafep.el: Don't mark functions that display ++ messages as safe. Suggested by Johan Bockgård. ++ ++2010-10-19 Stefan Monnier ++ ++ * minibuffer.el (completion--replace): Move point where it belongs ++ when there's a common suffix (bug#7215). ++ ++2010-10-19 Kenichi Handa ++ ++ * international/characters.el: Add category '|' (word breakable) ++ to fullwidth characters. ++ 2010-10-19 Michael Albinus - * 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 . diff --cc lisp/minibuffer.el index 98380f3926e,bc5a1d2e807..ee1fcae3119 --- a/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 src/ChangeLog index 7046d13262f,d33f9dd4f0b..c9d0e80c12f --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,28 -1,17 +1,41 @@@ -2010-10-18 Ken Brown ++2010-10-19 Ken Brown + + * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225). + -2010-10-15 Kenichi Handa ++2010-10-19 Kenichi Handa + + 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 +2010-10-18 Julien Danjou + + * frame.c (Fframe_pointer_visible_p): + Add `frame-pointer-visible-p' to get the pointer visibility. + +2010-10-18 Lars Magne Ingebrigtsen + + * 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 + + * 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 + + * 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 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 4d58542e660,dcab55a91e1..157ef72f550 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@@ -101,5 -132,10 +101,8 @@@ along with GNU Emacs. If not, see 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;