HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't call c-parse-state when c++-template-syntax-table is active.
[bpt/emacs.git]
/
lisp
/
progmodes
/
cc-fonts.el
diff --git
a/lisp/progmodes/cc-fonts.el
b/lisp/progmodes/cc-fonts.el
index
f6c47f5
..
bf5630d
100644
(file)
--- a/
lisp/progmodes/cc-fonts.el
+++ b/
lisp/progmodes/cc-fonts.el
@@
-1,6
+1,6
@@
;;; cc-fonts.el --- font lock support for CC Mode
;;; cc-fonts.el --- font lock support for CC Mode
-;; Copyright (C) 2002-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 2002-201
4
Free Software Foundation, Inc.
;; Authors: 2003- Alan Mackenzie
;; 2002- Martin Stjernholm
;; Authors: 2003- Alan Mackenzie
;; 2002- Martin Stjernholm
@@
-176,7
+176,6
@@
'font-lock-negation-char-face))
(cc-bytecomp-defun face-inverse-video-p) ; Only in Emacs.
'font-lock-negation-char-face))
(cc-bytecomp-defun face-inverse-video-p) ; Only in Emacs.
-(cc-bytecomp-defun face-property-instance) ; Only in XEmacs.
(defun c-make-inverse-face (oldface newface)
;; Emacs and XEmacs have completely different face manipulation
(defun c-make-inverse-face (oldface newface)
;; Emacs and XEmacs have completely different face manipulation
@@
-1308,7
+1307,8
@@
casts and declarations are fontified. Used on level 2 and higher."
(goto-char match-pos)
(backward-char)
(c-backward-token-2)
(goto-char match-pos)
(backward-char)
(c-backward-token-2)
- (looking-at c-block-stmt-2-key)))
+ (or (looking-at c-block-stmt-2-key)
+ (looking-at c-block-stmt-1-2-key))))
(setq context nil
c-restricted-<>-arglists t))
;; Near BOB.
(setq context nil
c-restricted-<>-arglists t))
;; Near BOB.
@@
-1473,11
+1473,7
@@
casts and declarations are fontified. Used on level 2 and higher."
(numberp (car paren-state))
(save-excursion
(goto-char (car paren-state))
(numberp (car paren-state))
(save-excursion
(goto-char (car paren-state))
- (c-backward-token-2)
- (or (looking-at c-brace-list-key)
- (progn
- (c-backward-token-2)
- (looking-at c-brace-list-key)))))))
+ (c-backward-over-enum-header)))))
(c-forward-token-2)
nil)
(c-forward-token-2)
nil)
@@
-1567,12
+1563,7
@@
casts and declarations are fontified. Used on level 2 and higher."
(eq (char-after encl-pos) ?\{)
(save-excursion
(goto-char encl-pos)
(eq (char-after encl-pos) ?\{)
(save-excursion
(goto-char encl-pos)
- (c-backward-syntactic-ws)
- (c-simple-skip-symbol-backward)
- (or (looking-at c-brace-list-key) ; "enum"
- (progn (c-backward-syntactic-ws)
- (c-simple-skip-symbol-backward)
- (looking-at c-brace-list-key)))))
+ (c-backward-over-enum-header)))
(c-syntactic-skip-backward "^{," nil t)
(c-put-char-property (1- (point)) 'c-type 'c-decl-id-start)
(c-syntactic-skip-backward "^{," nil t)
(c-put-char-property (1- (point)) 'c-type 'c-decl-id-start)
@@
-1893,7
+1884,7
@@
higher."
"\\)\\>"
;; Disallow various common punctuation chars that can't come
;; before the '{' of the enum list, to avoid searching too far.
"\\)\\>"
;; Disallow various common punctuation chars that can't come
;; before the '{' of the enum list, to avoid searching too far.
- "[^\]\[{}();
,
/#=]*"
+ "[^\]\[{}();/#=]*"
"{")
'((c-font-lock-declarators limit t nil)
(save-match-data
"{")
'((c-font-lock-declarators limit t nil)
(save-match-data
@@
-2486,7
+2477,7
@@
need for `pike-font-lock-extra-types'.")
(setq comment-beg nil))
(setq region-beg comment-beg))
(setq comment-beg nil))
(setq region-beg comment-beg))
- (if (e
q (elt (parse-partial-sexp comment-beg (+ comment-beg 2)) 7) t
)
+ (if (e
lt (parse-partial-sexp comment-beg (+ comment-beg 2)) 7
)
;; Collect a sequence of doc style line comments.
(progn
(goto-char comment-beg)
;; Collect a sequence of doc style line comments.
(progn
(goto-char comment-beg)