diff options
| author | Nick Roberts | 2005-05-03 06:45:08 +0000 |
|---|---|---|
| committer | Nick Roberts | 2005-05-03 06:45:08 +0000 |
| commit | a70d41f7d3325185487463a7b3f60dbf3bf008af (patch) | |
| tree | 6d7377ddfdc120ac9f2b75497be3ba435bfb8114 | |
| parent | be50a7270827efd9fe9a119fdeb7e3941a92e547 (diff) | |
| download | emacs-a70d41f7d3325185487463a7b3f60dbf3bf008af.tar.gz emacs-a70d41f7d3325185487463a7b3f60dbf3bf008af.zip | |
(cc-define-alist, cc-create-define-alist):
Remove these recent additions.
(c-mode): Restore to before 2005-04-28.
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index df27ee5a1b9..eaa798217cf 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -639,23 +639,6 @@ Note that the style variables are always made local to the buffer." | |||
| 639 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.y\\(acc\\)?\\'" . c-mode)) | 639 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.y\\(acc\\)?\\'" . c-mode)) |
| 640 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode)) | 640 | ;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode)) |
| 641 | 641 | ||
| 642 | (defvar cc-define-alist nil "Alist of #define directives for GUD tooltips.") | ||
| 643 | |||
| 644 | (defun cc-create-define-alist () | ||
| 645 | (let* ((file (buffer-file-name)) | ||
| 646 | (output | ||
| 647 | (with-output-to-string | ||
| 648 | (with-current-buffer standard-output | ||
| 649 | (call-process shell-file-name | ||
| 650 | (if (file-exists-p file) file nil) | ||
| 651 | (list t nil) nil "-c" cc-define-list-program)))) | ||
| 652 | (define-list (split-string output "\n" t)) | ||
| 653 | (name)) | ||
| 654 | (setq cc-define-alist nil) | ||
| 655 | (dolist (define define-list) | ||
| 656 | (setq name (nth 1 (split-string define "[( ]"))) | ||
| 657 | (push (cons name define) cc-define-alist)))) | ||
| 658 | |||
| 659 | ;;;###autoload | 642 | ;;;###autoload |
| 660 | (defun c-mode () | 643 | (defun c-mode () |
| 661 | "Major mode for editing K&R and ANSI C code. | 644 | "Major mode for editing K&R and ANSI C code. |
| @@ -679,14 +662,11 @@ Key bindings: | |||
| 679 | mode-name "C" | 662 | mode-name "C" |
| 680 | local-abbrev-table c-mode-abbrev-table | 663 | local-abbrev-table c-mode-abbrev-table |
| 681 | abbrev-mode t) | 664 | abbrev-mode t) |
| 682 | (make-local-variable 'cc-define-alist) | ||
| 683 | (use-local-map c-mode-map) | 665 | (use-local-map c-mode-map) |
| 684 | (c-init-language-vars-for 'c-mode) | 666 | (c-init-language-vars-for 'c-mode) |
| 685 | (c-common-init 'c-mode) | 667 | (c-common-init 'c-mode) |
| 686 | (easy-menu-add c-c-menu) | 668 | (easy-menu-add c-c-menu) |
| 687 | (cc-imenu-init cc-imenu-c-generic-expression) | 669 | (cc-imenu-init cc-imenu-c-generic-expression) |
| 688 | (if (buffer-file-name) (cc-create-define-alist)) | ||
| 689 | (add-hook 'after-save-hook 'cc-create-define-alist nil t) | ||
| 690 | (run-mode-hooks 'c-mode-common-hook 'c-mode-hook) | 670 | (run-mode-hooks 'c-mode-common-hook 'c-mode-hook) |
| 691 | (c-update-modeline)) | 671 | (c-update-modeline)) |
| 692 | 672 | ||