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

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-langs.el
diff -c emacs/lisp/progmodes/cc-langs.el:1.20 
emacs/lisp/progmodes/cc-langs.el:1.21
*** emacs/lisp/progmodes/cc-langs.el:1.20       Wed Dec  4 06:47:46 2002
--- emacs/lisp/progmodes/cc-langs.el    Mon Apr  7 18:40:37 2003
***************
*** 181,198 ****
    )
  
  ;; Regexp describing a `symbol' in all languages, not excluding
! ;; keywords.  We cannot use just `word' syntax class since `_' cannot
! ;; be in word class.  Putting underscore in word class breaks forward
! ;; word movement behavior that users are familiar with.  Besides, it
! ;; runs counter to Emacs convention.
! ;;
! ;; This definition isn't correct for the first character in the
! ;; languages that accept the full range of Unicode word constituents
! ;; in identifiers (e.g. Java and Pike).  For that we'd need to make a
! ;; regexp that matches all characters in the word constituent class
! ;; except 0-9, and the regexp engine currently can't do that.
  (c-lang-defconst c-symbol-key
!   (c c++ objc java idl) "[_a-zA-Z]\\(\\w\\|\\s_\\)*"
    pike (concat "\\(" (c-lang-var c-symbol-key c) "\\|"
               (c-make-keywords-re nil
                 '("`+" "`-" "`&" "`|" "`^" "`<<" "`>>" "`*" "`/" "`%" "`~"
--- 181,196 ----
    )
  
  ;; Regexp describing a `symbol' in all languages, not excluding
! ;; keywords.
  (c-lang-defconst c-symbol-key
!   (c c++ objc java idl)
!   (if (string-match "[[:alpha:]]" "a")
!       "[[:alpha:]_][[:alnum:]_]*"     ; Emacs 21.
!     ;; We cannot use just `word' syntax class since `_' cannot be
!     ;; in word class.  Putting underscore in word class breaks
!     ;; forward word movement behavior that users are familiar
!     ;; with.  Besides, it runs counter to Emacs convention.
!     "[a-zA-Z_]\\(\\w\\|_\\)*")
    pike (concat "\\(" (c-lang-var c-symbol-key c) "\\|"
               (c-make-keywords-re nil
                 '("`+" "`-" "`&" "`|" "`^" "`<<" "`>>" "`*" "`/" "`%" "`~"