Merge from emacs--rel--22

[gnu-emacs] / lisp / progmodes / cc-mode.el

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index db71bf334088eca1766b206413d451d7b54023d1..2d8e66ab3fc266760400d64cd10699f8264266b9 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -190,7 +190,8 @@ control).  See \"cc-mode.el\" for more info."
            (run-hooks 'c-initialization-hook)
            ;; Fix obsolete variables.
            (if (boundp 'c-comment-continuation-stars)
-               (setq c-block-comment-prefix c-comment-continuation-stars))
+               (setq c-block-comment-prefix
+                     (symbol-value 'c-comment-continuation-stars)))
            (add-hook 'change-major-mode-hook 'c-leave-cc-mode-mode)
            (setq c-initialization-ok t))
        ;; Will try initialization hooks again if they failed.
@@ -269,7 +270,9 @@ control).  See \"cc-mode.el\" for more info."
                             'c-indent-new-comment-line
                             c-mode-base-map global-map)
   (substitute-key-definition 'indent-for-tab-command
-                            'c-indent-command
+                            ;; XXX Is this the right thing to do
+                            ;; here?
+                            'c-indent-line-or-region
                             c-mode-base-map global-map)
   (when (fboundp 'comment-indent-new-line)
     ;; indent-new-comment-line has changed name to
@@ -711,7 +714,7 @@ Note that the style variables are always made local to the buffer."
     (and c-file-style
         (c-set-style c-file-style))
     (and c-file-offsets
-        (mapcar
+        (mapc
          (lambda (langentry)
            (let ((langelem (car langentry))
                  (offset (cdr langentry)))
@@ -1558,15 +1561,15 @@ Key bindings:
                     adaptive-fill-mode
                     adaptive-fill-regexp)
                   nil)))
-       (mapcar (lambda (var) (unless (boundp var)
-                               (setq vars (delq var vars))))
-               '(signal-error-on-buffer-boundary
-                 filladapt-mode
-                 defun-prompt-regexp
-                 font-lock-mode
-                 font-lock-maximum-decoration
-                 parse-sexp-lookup-properties
-                 lookup-syntax-properties))
+       (mapc (lambda (var) (unless (boundp var)
+                             (setq vars (delq var vars))))
+             '(signal-error-on-buffer-boundary
+               filladapt-mode
+               defun-prompt-regexp
+               font-lock-mode
+               font-lock-maximum-decoration
+               parse-sexp-lookup-properties
+               lookup-syntax-properties))
        vars)
       (lambda ()
        (run-hooks 'c-prepare-bug-report-hooks)