Mercurial > emacs
changeset 107230:8e842bd86ccf
from trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 26 Feb 2010 10:22:23 +0900 |
| parents | ef024f9113f9 (current diff) 0255e27f26c9 (diff) |
| children | 36765efaf0d1 f24a9a68524d |
| files | src/ChangeLog |
| diffstat | 5 files changed, 32 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Feb 26 10:17:28 2010 +0900 +++ b/lisp/ChangeLog Fri Feb 26 10:22:23 2010 +0900 @@ -1,3 +1,13 @@ +2010-02-25 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-engine.el (c-clear-<-pair-props) + (c-clear->-pair-props): Correct to wipe category text props, not + syntax-table ones. + + * progmodes/cc-mode.el (c-after-change): Remove any hard + syntax-table properties for <, > which, e.g., C-y has + inopportunely converted from category properties. + 2010-02-24 Chong Yidong <cyd@stupidchicken.com> * files.el (hack-local-variables-filter): For eval forms, also
--- a/lisp/progmodes/cc-engine.el Fri Feb 26 10:17:28 2010 +0900 +++ b/lisp/progmodes/cc-engine.el Fri Feb 26 10:22:23 2010 +0900 @@ -4929,8 +4929,8 @@ (c-go-list-forward)) (when (equal (c-get-char-property (1- (point)) 'syntax-table) c->-as-paren-syntax) ; should always be true. - (c-clear-char-property (1- (point)) 'syntax-table)) - (c-clear-char-property pos 'syntax-table)))) + (c-clear-char-property (1- (point)) 'category)) + (c-clear-char-property pos 'category)))) (defun c-clear->-pair-props (&optional pos) ;; POS (default point) is at a > character. If it is marked with @@ -4946,8 +4946,8 @@ (c-go-up-list-backward)) (when (equal (c-get-char-property (point) 'syntax-table) c-<-as-paren-syntax) ; should always be true. - (c-clear-char-property (point) 'syntax-table)) - (c-clear-char-property pos 'syntax-table)))) + (c-clear-char-property (point) 'category)) + (c-clear-char-property pos 'category)))) (defun c-clear-<>-pair-props (&optional pos) ;; POS (default point) is at a < or > character. If it has an
--- a/lisp/progmodes/cc-mode.el Fri Feb 26 10:17:28 2010 +0900 +++ b/lisp/progmodes/cc-mode.el Fri Feb 26 10:22:23 2010 +0900 @@ -642,11 +642,9 @@ (widen) (save-excursion (if c-get-state-before-change-functions - (let ((beg (point-min)) - (end (point-max))) - (mapc (lambda (fn) - (funcall fn beg end)) - c-get-state-before-change-functions))) + (mapc (lambda (fn) + (funcall fn (point-min) (point-max))) + c-get-state-before-change-functions)) (if c-before-font-lock-function (funcall c-before-font-lock-function (point-min) (point-max) (- (point-max) (point-min)))))) @@ -1042,6 +1040,14 @@ (when (> beg end) (setq beg end))) + ;; C-y is capable of spuriously converting category properties + ;; c-</>-as-paren-syntax into hard syntax-table properties. Remove + ;; these when it happens. + (c-clear-char-property-with-value beg end 'syntax-table + c-<-as-paren-syntax) + (c-clear-char-property-with-value beg end 'syntax-table + c->-as-paren-syntax) + (c-trim-found-types beg end old-len) ; maybe we don't need all of these. (c-invalidate-sws-region-after beg end) (c-invalidate-state-cache beg)
--- a/src/ChangeLog Fri Feb 26 10:17:28 2010 +0900 +++ b/src/ChangeLog Fri Feb 26 10:22:23 2010 +0900 @@ -2,6 +2,11 @@ * xdisp.c (reseat_to_string): Fix previous change. +2010-02-26 David Reitter <david.reitter@gmail.com> + + * nsfont.m (nsfont_draw): ns_antialias_text should be a + Lisp_Object (Bug#4736). + 2010-02-25 Kenichi Handa <handa@m17n.org> * xdisp.c (reseat_to_string): Fix previous change (bug#5609).
--- a/src/nsfont.m Fri Feb 26 10:17:28 2010 +0900 +++ b/src/nsfont.m Fri Feb 26 10:22:23 2010 +0900 @@ -50,7 +50,7 @@ static Lisp_Object Vns_reg_to_script; static Lisp_Object Qapple, Qroman, Qmedium; extern Lisp_Object Qappend; -extern int ns_antialias_text; +extern Lisp_Object ns_antialias_text; extern float ns_antialias_threshold; extern int ns_tmp_flags; extern struct nsfont_info *ns_tmp_font; @@ -1231,7 +1231,7 @@ CGContextSetFont (gcontext, font->cgfont); CGContextSetFontSize (gcontext, font->size); - if (ns_antialias_text == Qnil || font->size <= ns_antialias_threshold) + if (NILP (ns_antialias_text) || font->size <= ns_antialias_threshold) CGContextSetShouldAntialias (gcontext, 0); else CGContextSetShouldAntialias (gcontext, 1);