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

[Alan Mackenzie]

Index: emacs/lisp/progmodes/cc-langs.el
diff -c emacs/lisp/progmodes/cc-langs.el:1.34 
emacs/lisp/progmodes/cc-langs.el:1.35
*** emacs/lisp/progmodes/cc-langs.el:1.34       Fri Dec  2 12:30:36 2005
--- emacs/lisp/progmodes/cc-langs.el    Sat Dec  3 11:04:17 2005
***************
*** 2580,2594 ****
          (when (boundp (c-mode-symbol "font-lock-extra-types"))
            (c-mode-var "font-lock-extra-types")))
         (regexp-strings
!         (mapcan (lambda (re)
                    (when (string-match "[][.*+?^$\\]" re)
                      (list re)))
!                 extra-types))
         (plain-strings
!         (mapcan (lambda (re)
                    (unless (string-match "[][.*+?^$\\]" re)
                      (list re)))
!                 extra-types)))
      (concat "\\<\\("
            (c-concat-separated
             (append (list (c-make-keywords-re nil
--- 2580,2596 ----
          (when (boundp (c-mode-symbol "font-lock-extra-types"))
            (c-mode-var "font-lock-extra-types")))
         (regexp-strings
!         (apply 'nconc
!                (mapcar (lambda (re)
                    (when (string-match "[][.*+?^$\\]" re)
                      (list re)))
!                 extra-types)))
         (plain-strings
!         (apply 'nconc
!                (mapcar (lambda (re)
                    (unless (string-match "[][.*+?^$\\]" re)
                      (list re)))
!                 extra-types))))
      (concat "\\<\\("
            (c-concat-separated
             (append (list (c-make-keywords-re nil