emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r102000: Merge changes from emacs-23


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r102000: Merge changes from emacs-23 branch.
Date: Tue, 19 Oct 2010 13:44:07 +0200
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 102000 [merge]
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-19 13:44:07 +0200
message:
  Merge changes from emacs-23 branch.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/regexp-opt.el
  lisp/emacs-lisp/unsafep.el
  lisp/international/characters.el
  lisp/minibuffer.el
  lisp/repeat.el
  src/ChangeLog
  src/s/cygwin.h
  src/xftfont.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-19 09:50:07 +0000
+++ b/lisp/ChangeLog    2010-10-19 11:44:07 +0000
@@ -1,3 +1,22 @@
+2010-10-19  Stefan Monnier  <address@hidden>
+
+       * repeat.el (repeat): Use read-key (bug#6256).
+
+2010-10-19  Chong Yidong  <address@hidden>
+
+       * emacs-lisp/unsafep.el: Don't mark functions that display
+       messages as safe.  Suggested by Johan Bockgård.
+
+2010-10-19  Stefan Monnier  <address@hidden>
+
+       * minibuffer.el (completion--replace): Move point where it belongs
+       when there's a common suffix (bug#7215).
+
+2010-10-19  Kenichi Handa  <address@hidden>
+
+       * international/characters.el: Add category '|' (word breakable)
+       to fullwidth characters.
+
 2010-10-19  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-do-file-attributes-with-stat)

=== modified file 'lisp/emacs-lisp/regexp-opt.el'
--- a/lisp/emacs-lisp/regexp-opt.el     2010-10-07 07:24:21 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el     2010-10-19 11:44:07 +0000
@@ -141,11 +141,10 @@
   (require 'cl))
 
 (defun regexp-opt-group (strings &optional paren lax)
-  ;; Return a regexp to match a string in the sorted list STRINGS.
-  ;; If PAREN non-nil, output regexp parentheses around returned regexp.
-  ;; If LAX non-nil, don't output parentheses if it doesn't require them.
-  ;; Merges keywords to avoid backtracking in Emacs' regexp matcher.
-
+  "Return a regexp to match a string in the sorted list STRINGS.
+If PAREN non-nil, output regexp parentheses around returned regexp.
+If LAX non-nil, don't output parentheses if it doesn't require them.
+Merges keywords to avoid backtracking in Emacs' regexp matcher."
   ;; The basic idea is to find the shortest common prefix or suffix, remove it
   ;; and recurse.  If there is no prefix, we divide the list into two so that
   ;; \(at least) one half will have at least a one-character common prefix.
@@ -239,9 +238,7 @@
 
 
 (defun regexp-opt-charset (chars)
-  ;;
-  ;; Return a regexp to match a character in CHARS.
-  ;;
+  "Return a regexp to match a character in CHARS."
   ;; The basic idea is to find character ranges.  Also we take care in the
   ;; position of character set meta characters in the character set regexp.
   ;;

=== modified file 'lisp/emacs-lisp/unsafep.el'
--- a/lisp/emacs-lisp/unsafep.el        2010-01-13 08:35:10 +0000
+++ b/lisp/emacs-lisp/unsafep.el        2010-10-18 17:28:20 +0000
@@ -101,15 +101,13 @@
 (dolist (x '(;;Special forms
             and catch if or prog1 prog2 progn while unwind-protect
             ;;Safe subrs that have some side-effects
-            ding error message minibuffer-message random read-minibuffer
-            signal sleep-for string-match throw y-or-n-p yes-or-no-p
+            ding error random signal sleep-for string-match throw
             ;;Defsubst functions from subr.el
             caar cadr cdar cddr
             ;;Macros from subr.el
-            save-match-data unless when with-temp-message
+            save-match-data unless when
             ;;Functions from subr.el that have side effects
-            read-passwd split-string replace-regexp-in-string
-            play-sound-file))
+            split-string replace-regexp-in-string play-sound-file))
   (put x 'safe-function t))
 
 ;;;###autoload

=== modified file 'lisp/international/characters.el'
--- a/lisp/international/characters.el  2010-03-01 11:34:11 +0000
+++ b/lisp/international/characters.el  2010-10-15 00:41:53 +0000
@@ -188,6 +188,9 @@
                               cp932-2-byte))
   (map-charset-chars #'modify-category-entry l ?j))
 
+;; Fullwidth characters
+(modify-category-entry '(#xff01 . #xff60) ?\|)
+
 ;; Unicode equivalents of JISX0201-kana
 (let ((range '(#xff61 . #xff9f)))
   (modify-category-entry range  ?k)

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2010-10-08 10:14:47 +0000
+++ b/lisp/minibuffer.el        2010-10-19 11:44:07 +0000
@@ -508,10 +508,11 @@
       (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.

=== modified file 'lisp/repeat.el'
--- a/lisp/repeat.el    2010-09-14 14:41:53 +0000
+++ b/lisp/repeat.el    2010-10-19 11:44:07 +0000
@@ -335,7 +335,7 @@
        (setq real-last-command 'repeat)
        (setq repeat-undo-count 1)
        (unwind-protect
-           (while (let ((evt (read-event))) ;FIXME: read-key maybe?
+           (while (let ((evt (read-key)))
                      ;; For clicks, we need to strip the meta-data to
                      ;; check the underlying event name.
                      (eq (or (car-safe evt) evt)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-18 21:07:31 +0000
+++ b/src/ChangeLog     2010-10-19 11:44:07 +0000
@@ -1,3 +1,16 @@
+2010-10-19  Ken Brown  <address@hidden>
+
+       * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225).
+
+2010-10-19  Kenichi Handa  <address@hidden>
+
+       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-18  Julien Danjou  <address@hidden>
 
        * frame.c (Fframe_pointer_visible_p):

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2010-09-20 11:38:50 +0000
+++ b/src/s/cygwin.h    2010-10-19 11:44:07 +0000
@@ -101,5 +101,8 @@
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
 
+/* 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) */

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2010-08-05 23:34:12 +0000
+++ b/src/xftfont.c     2010-10-19 11:44:07 +0000
@@ -32,6 +32,7 @@
 #include "blockinput.h"
 #include "character.h"
 #include "charset.h"
+#include "composite.h"
 #include "fontset.h"
 #include "font.h"
 #include "ftfont.h"
@@ -664,6 +665,23 @@
   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 (FRAME_PTR f)
 {
@@ -753,6 +771,9 @@
   xftfont_driver.draw = xftfont_draw;
   xftfont_driver.end_for_frame = xftfont_end_for_frame;
   xftfont_driver.cached_font_ok = xftfont_cached_font_ok;
+#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF)
+  xftfont_driver.shape = xftfont_shape;
+#endif
 
   register_font_driver (&xftfont_driver, NULL);
 }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]