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

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Alan Mackenzie <acmacm> 07/01/01 22:11:28

Index: cc-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-mode.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- cc-mode.el  17 Dec 2006 22:15:46 -0000      1.51
+++ cc-mode.el  1 Jan 2007 22:11:27 -0000       1.52
@@ -288,8 +288,9 @@
                               c-mode-base-map global-map))
 
   ;; RMS says don't make these the default.
-;;  (define-key c-mode-base-map "\e\C-a"    'c-beginning-of-defun)
-;;  (define-key c-mode-base-map "\e\C-e"    'c-end-of-defun)
+  ;; (April 2006): RMS has now approved these commands as defaults.
+  (define-key c-mode-base-map "\e\C-a"    'c-beginning-of-defun)
+  (define-key c-mode-base-map "\e\C-e"    'c-end-of-defun)
 
   (define-key c-mode-base-map "\C-c\C-n"  'c-forward-conditional)
   (define-key c-mode-base-map "\C-c\C-p"  'c-backward-conditional)
@@ -728,8 +729,8 @@
     ;; We prevent this by temporarily removing `mode' from the Local Variables
     ;; section.
     (if (or c-file-style c-file-offsets)
+       (let ((hack-local-variables-hook nil) (inhibit-read-only t))
        (c-tentative-buffer-changes
-         (let ((hack-local-variables-hook nil))
            (c-remove-any-local-eval-or-mode-variables)
            (hack-local-variables))
          nil))))