summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-fonts.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-12-20 07:51:17 -0800
committerGlenn Morris <rgm@gnu.org>2018-12-20 07:51:17 -0800
commit62112a77f191c0b00aa420ce2d0fee8aa03592bf (patch)
tree3f6f65f84d5f4a600534ae29aec1ef49fa797c4f /lisp/progmodes/cc-fonts.el
parent1e5f84805884e37563db9f16076d458ceaa03917 (diff)
parent081fb694c3f88e77d4a0e09fba8ce457037b9132 (diff)
downloademacs-62112a77f191c0b00aa420ce2d0fee8aa03592bf.tar.gz
Merge from origin/emacs-26
081fb69 (origin/emacs-26) Check result from c-backward-token-2 to avo... f4ea746 cl-make-random-state was not copying its arg
Diffstat (limited to 'lisp/progmodes/cc-fonts.el')
-rw-r--r--lisp/progmodes/cc-fonts.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 2e85924f7be..e91e54df9ca 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1255,8 +1255,8 @@ casts and declarations are fontified. Used on level 2 and higher."
(save-excursion
(goto-char match-pos)
(while
- (progn (c-backward-token-2)
- (eq (char-after) ?\()))
+ (and (zerop (c-backward-token-2))
+ (eq (char-after) ?\()))
(looking-at c-arithmetic-op-regexp)))
(cons nil nil))
;; In a C++ member initialization list.