[Emacs-diffs] emacs/lisp/progmodes cc-engine.el cc-langs.el

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Alan Mackenzie <acmacm> 09/09/26 09:18:42

Modified files:
        lisp/progmodes : cc-engine.el cc-langs.el 

Log message:
        cc-langs.el (c-nonlabel-token-key): Allow quoted character constants (as
        case labels).
        
        cc-engine.el (c-beginning-of-statement-1): Correct buggy bracketing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cc-engine.el?cvsroot=emacs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cc-langs.el?cvsroot=emacs&r1=1.67&r2=1.68

Patches:
Index: cc-engine.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-engine.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- cc-engine.el        29 Aug 2009 02:07:45 -0000      1.76
+++ cc-engine.el        26 Sep 2009 09:18:41 -0000      1.77
@@ -1067,7 +1067,8 @@
                 (not (eq ret 'beginning))
                 (looking-at c-case-kwds-regexp))
        (if (< after-case:-pos start)
-           (setq pos after-case:-pos)
+           (setq pos after-case:-pos))
+       (if (eq ret 'same)
          (setq ret 'label)))
 
       ;; Skip over the unary operators that can start the statement.

Index: cc-langs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-langs.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- cc-langs.el 19 May 2009 22:35:07 -0000      1.67
+++ cc-langs.el 26 Sep 2009 09:18:42 -0000      1.68
@@ -2885,7 +2885,7 @@
 i.e. before \":\".  Only used if `c-recognize-colon-labels' is set."
   t (concat
      ;; Don't allow string literals.
-     "[\"']\\|"
+     "\"\\|"
      ;; All keywords except `c-label-kwds' and `c-protection-kwds'.
      (c-make-keywords-re t
        (set-difference (c-lang-const c-keywords)