Merge from emacs--devo--0

[gnu-emacs] / lisp / font-lock.el

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index cc40653ce0cf6eae94bf0b4ecc9205d9f92b5af5..2f2659a6e1c24993d2f7fd866d503920968588d1 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2134,7 +2134,8 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
            ;; Move over any item value, etc., to the next item.
            (while (not (looking-at "[ \t\n]*\\(\\(,\\)\\|;\\|\\'\\)"))
              (goto-char (or (scan-sexps (point) 1) (point-max))))
-           (goto-char (match-end 2)))
+           (if (match-end 2)
+               (goto-char (match-end 2))))
        (error t)))))
 
 ;; C preprocessor(cpp) is used outside of C, C++ and Objective-C source file.