Commit 06aac901 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

from trunk

parents 7379cfce cf2fdcfb
2010-02-25 Alan Mackenzie <>
* 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 <>
* files.el (hack-local-variables-filter): For eval forms, also
......@@ -4929,8 +4929,8 @@ comment at the start of cc-engine.el for more info."
(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 @@ comment at the start of cc-engine.el for more info."
(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
......@@ -642,11 +642,9 @@ compatible with old code; callers should always specify it."
(if c-get-state-before-change-functions
(let ((beg (point-min))
(end (point-max)))
(mapc (lambda (fn)
(funcall fn beg end))
(mapc (lambda (fn)
(funcall fn (point-min) (point-max)))
(if c-before-font-lock-function
(funcall c-before-font-lock-function (point-min) (point-max)
(- (point-max) (point-min))))))
......@@ -1042,6 +1040,14 @@ Note that the style variables are always made local to the buffer."
(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-clear-char-property-with-value beg end 'syntax-table
(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)
......@@ -2,6 +2,11 @@
* xdisp.c (reseat_to_string): Fix previous change.
2010-02-26 David Reitter <>
* nsfont.m (nsfont_draw): ns_antialias_text should be a
Lisp_Object (Bug#4736).
2010-02-25 Kenichi Handa <>
* xdisp.c (reseat_to_string): Fix previous change (bug#5609).
......@@ -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 @@ WITH_BACKGROUND is zero when (FROM > 0 || TO < S->nchars). */
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);
CGContextSetShouldAntialias (gcontext, 1);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment