aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-mode.el21
2 files changed, 13 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae475fa71cd..5838b7c244e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-11-26 Sam Steingold <sds@gnu.org>
2
3 * progmodes/cc-mode.el (c-submit-bug-report): Make sure that the
4 arguments to `insert' are strings.
5
12001-11-26 Richard M. Stallman <rms@gnu.org> 62001-11-26 Richard M. Stallman <rms@gnu.org>
2 7
3 * startup.el (command-line-1): Call kill-buffer only in non-fancy case. 8 * startup.el (command-line-1): Call kill-buffer only in non-fancy case.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0ac23c85c27..6c80702864c 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -385,12 +385,10 @@ Note that the style variables are always made local to the buffer."
385 (c-set-style c-file-style)) 385 (c-set-style c-file-style))
386 (and c-file-offsets 386 (and c-file-offsets
387 (mapcar 387 (mapcar
388 (function 388 (lambda (langentry)
389 (lambda (langentry) 389 (let ((langelem (car langentry))
390 (let ((langelem (car langentry)) 390 (offset (cdr langentry)))
391 (offset (cdr langentry))) 391 (c-set-offset langelem offset)))
392 (c-set-offset langelem offset)
393 )))
394 c-file-offsets))) 392 c-file-offsets)))
395 393
396(add-hook 'hack-local-variables-hook 'c-postprocess-file-styles) 394(add-hook 'hack-local-variables-hook 'c-postprocess-file-styles)
@@ -893,13 +891,10 @@ CC Mode by making sure the proper entries are present on
893 filladapt-mode 891 filladapt-mode
894 defun-prompt-regexp)) 892 defun-prompt-regexp))
895 vars) 893 vars)
896 (function 894 (lambda ()
897 (lambda () 895 (run-hooks 'c-prepare-bug-report-hooks)
898 (run-hooks 'c-prepare-bug-report-hooks) 896 (insert (format "Buffer Style: %s\n\nc-emacs-features: %s\n"
899 (insert 897 style c-features)))))))
900 "Buffer Style: " style "\n\n"
901 (format "c-emacs-features: %s\n" c-features)
902 )))))))
903 898
904 899
905(cc-provide 'cc-mode) 900(cc-provide 'cc-mode)