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

[Daniel Pfeiffer]

Index: emacs/lisp/progmodes/cc-mode.el
diff -c emacs/lisp/progmodes/cc-mode.el:1.30 
emacs/lisp/progmodes/cc-mode.el:1.31
*** emacs/lisp/progmodes/cc-mode.el:1.30        Mon Sep  1 15:45:34 2003
--- emacs/lisp/progmodes/cc-mode.el     Sat Nov 13 20:23:38 2004
***************
*** 491,497 ****
  
    ;; Install the functions that ensure that various internal caches
    ;; don't become invalid due to buffer changes.
-   (make-local-hook 'after-change-functions)
    (add-hook 'after-change-functions 'c-after-change nil t))
  
  (defun c-after-font-lock-init ()
--- 491,496 ----
***************
*** 517,524 ****
          c-beginning-of-syntax
          (font-lock-mark-block-function
           . c-mark-function)))
- 
-   (make-local-hook 'font-lock-mode-hook)
    (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t))
  
  (defun c-setup-doc-comment-style ()
--- 516,521 ----
***************
*** 669,676 ****
    (c-common-init 'c-mode)
    (easy-menu-add c-c-menu)
    (cc-imenu-init cc-imenu-c-generic-expression)
!   (run-hooks 'c-mode-common-hook)
!   (run-hooks 'c-mode-hook)
    (c-update-modeline))
  
  
--- 666,672 ----
    (c-common-init 'c-mode)
    (easy-menu-add c-c-menu)
    (cc-imenu-init cc-imenu-c-generic-expression)
!   (run-mode-hooks 'c-mode-common-hook 'c-mode-hook)
    (c-update-modeline))
  
  
***************
*** 733,740 ****
    (c-common-init 'c++-mode)
    (easy-menu-add c-c++-menu)
    (cc-imenu-init cc-imenu-c++-generic-expression)
!   (run-hooks 'c-mode-common-hook)
!   (run-hooks 'c++-mode-hook)
    (c-update-modeline))
  
  
--- 729,735 ----
    (c-common-init 'c++-mode)
    (easy-menu-add c-c++-menu)
    (cc-imenu-init cc-imenu-c++-generic-expression)
!   (run-mode-hooks 'c-mode-common-hook 'c++-mode-hook)
    (c-update-modeline))
  
  
***************
*** 798,805 ****
    (c-common-init 'objc-mode)
    (easy-menu-add c-objc-menu)
    (cc-imenu-init nil 'cc-imenu-objc-function)
!   (run-hooks 'c-mode-common-hook)
!   (run-hooks 'objc-mode-hook)
    (c-update-modeline))
  
  
--- 793,799 ----
    (c-common-init 'objc-mode)
    (easy-menu-add c-objc-menu)
    (cc-imenu-init nil 'cc-imenu-objc-function)
!   (run-mode-hooks 'c-mode-common-hook 'objc-mode-hook)
    (c-update-modeline))
  
  
***************
*** 869,876 ****
    (c-common-init 'java-mode)
    (easy-menu-add c-java-menu)
    (cc-imenu-init cc-imenu-java-generic-expression)
!   (run-hooks 'c-mode-common-hook)
!   (run-hooks 'java-mode-hook)
    (c-update-modeline))
  
  
--- 863,869 ----
    (c-common-init 'java-mode)
    (easy-menu-add c-java-menu)
    (cc-imenu-init cc-imenu-java-generic-expression)
!   (run-mode-hooks 'c-mode-common-hook 'java-mode-hook)
    (c-update-modeline))
  
  
***************
*** 928,935 ****
    (c-common-init 'idl-mode)
    (easy-menu-add c-idl-menu)
    ;;(cc-imenu-init cc-imenu-idl-generic-expression) ;TODO
!   (run-hooks 'c-mode-common-hook)
!   (run-hooks 'idl-mode-hook)
    (c-update-modeline))
  
  
--- 921,927 ----
    (c-common-init 'idl-mode)
    (easy-menu-add c-idl-menu)
    ;;(cc-imenu-init cc-imenu-idl-generic-expression) ;TODO
!   (run-mode-hooks 'c-mode-common-hook 'idl-mode-hook)
    (c-update-modeline))
  
  
***************
*** 991,998 ****
    (c-common-init 'pike-mode)
    (easy-menu-add c-pike-menu)
    ;;(cc-imenu-init cc-imenu-pike-generic-expression) ;TODO
!   (run-hooks 'c-mode-common-hook)
!   (run-hooks 'pike-mode-hook)
    (c-update-modeline))
  
  
--- 983,989 ----
    (c-common-init 'pike-mode)
    (easy-menu-add c-pike-menu)
    ;;(cc-imenu-init cc-imenu-pike-generic-expression) ;TODO
!   (run-mode-hooks 'c-mode-common-hook 'pike-mode-hook)
    (c-update-modeline))
  
  
***************
*** 1084,1091 ****
      ;; in cc-engine.el, just before (defun c-fast-in-literal ...
      (defalias 'c-in-literal 'c-slow-in-literal)
  
!     (run-hooks 'c-mode-common-hook)
!     (run-hooks 'awk-mode-hook)
      (c-update-modeline))
  ) ;; closes the (if (not (memq 'syntax-properties c-emacs-features))
  
--- 1075,1081 ----
      ;; in cc-engine.el, just before (defun c-fast-in-literal ...
      (defalias 'c-in-literal 'c-slow-in-literal)
  
!     (run-mode-hooks 'c-mode-common-hook 'awk-mode-hook)
      (c-update-modeline))
  ) ;; closes the (if (not (memq 'syntax-properties c-emacs-features))