Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 583-585)

   - Update from CVS
   - Fix admin/quick-install-emacs to work with recent versions of autoconf

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-160

1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 40407f3819a..993fd102951 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -288,8 +288,9 @@ control).  See \"cc-mode.el\" for more info."
 			       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 @@ Note that the style variables are always made local to the buffer."
     ;; We prevent this by temporarily removing `mode' from the Local Variables
     ;; section.
     (if (or c-file-style c-file-offsets)
-	(c-tentative-buffer-changes
-	  (let ((hack-local-variables-hook nil))
+	(let ((hack-local-variables-hook nil) (inhibit-read-only t))
+	  (c-tentative-buffer-changes
 	    (c-remove-any-local-eval-or-mode-variables)
 	    (hack-local-variables))
 	  nil))))