diff options
| author | Richard M. Stallman | 1997-08-09 18:26:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-08-09 18:26:19 +0000 |
| commit | fb032a95337268c0e7561dcdddc3e09da402b1a1 (patch) | |
| tree | 4ec93de6344eaba56e4d9a8a5d5f2583977bc40e | |
| parent | 9da7d0849aac6d79221a8875f84a13a74dc7a93f (diff) | |
| download | emacs-fb032a95337268c0e7561dcdddc3e09da402b1a1.tar.gz emacs-fb032a95337268c0e7561dcdddc3e09da402b1a1.zip | |
(c-symbol-key):
First character must be a letter or underscore.
(c-styles-are-initialized): Variable deleted.
(c-common-init): Don't initialize styles here.
(idl-mode-abbrev-table): New variable.
(idl-mode-map, idl-mode-syntax-table): New variables.
(c-idl-menu): New menu.
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index c92118e76b7..918be2f7188 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | ;; 1985 Richard M. Stallman | 7 | ;; 1985 Richard M. Stallman |
| 8 | ;; Maintainer: cc-mode-help@python.org | 8 | ;; Maintainer: cc-mode-help@python.org |
| 9 | ;; Created: 22-Apr-1997 (split from cc-mode.el) | 9 | ;; Created: 22-Apr-1997 (split from cc-mode.el) |
| 10 | ;; Version: 5.13 | 10 | ;; Version: 5.14 |
| 11 | ;; Keywords: c languages oop | 11 | ;; Keywords: c languages oop |
| 12 | 12 | ||
| 13 | ;; This file is part of GNU Emacs. | 13 | ;; This file is part of GNU Emacs. |
| @@ -197,17 +197,8 @@ | |||
| 197 | For use with the variable `java-mode-hook'." | 197 | For use with the variable `java-mode-hook'." |
| 198 | (c-set-style "java")) | 198 | (c-set-style "java")) |
| 199 | 199 | ||
| 200 | (defvar c-styles-are-initialized nil) | ||
| 201 | |||
| 202 | (defun c-common-init () | 200 | (defun c-common-init () |
| 203 | ;; Common initializations for all modes. | 201 | ;; Common initializations for all modes. |
| 204 | (if c-styles-are-initialized | ||
| 205 | nil | ||
| 206 | (require 'cc-styles) | ||
| 207 | (c-initialize-builtin-style) | ||
| 208 | (if c-style-variables-are-local-p | ||
| 209 | (c-make-styles-buffer-local)) | ||
| 210 | (setq c-styles-are-initialized t)) | ||
| 211 | ;; these variables should always be buffer local; they do not affect | 202 | ;; these variables should always be buffer local; they do not affect |
| 212 | ;; indentation style. | 203 | ;; indentation style. |
| 213 | (make-local-variable 'paragraph-start) | 204 | (make-local-variable 'paragraph-start) |
| @@ -430,7 +421,7 @@ it finds in `c-file-offsets'." | |||
| 430 | ;; Support for C | 421 | ;; Support for C |
| 431 | 422 | ||
| 432 | (defvar c-mode-abbrev-table nil | 423 | (defvar c-mode-abbrev-table nil |
| 433 | "Abbrev table in use in c-mode buffers.") | 424 | "Abbreviation table used in c-mode buffers.") |
| 434 | (define-abbrev-table 'c-mode-abbrev-table ()) | 425 | (define-abbrev-table 'c-mode-abbrev-table ()) |
| 435 | 426 | ||
| 436 | (defvar c-mode-map () | 427 | (defvar c-mode-map () |
| @@ -468,7 +459,7 @@ global and affect all future `c-mode' buffers." | |||
| 468 | ;; Support for C++ | 459 | ;; Support for C++ |
| 469 | 460 | ||
| 470 | (defvar c++-mode-abbrev-table nil | 461 | (defvar c++-mode-abbrev-table nil |
| 471 | "Abbrev table in use in c++-mode buffers.") | 462 | "Abbreviation table used in c++-mode buffers.") |
| 472 | (define-abbrev-table 'c++-mode-abbrev-table ()) | 463 | (define-abbrev-table 'c++-mode-abbrev-table ()) |
| 473 | 464 | ||
| 474 | (defvar c++-mode-map () | 465 | (defvar c++-mode-map () |
| @@ -506,7 +497,7 @@ global and affect all future `c-mode' buffers." | |||
| 506 | ;; Support for Objective-C | 497 | ;; Support for Objective-C |
| 507 | 498 | ||
| 508 | (defvar objc-mode-abbrev-table nil | 499 | (defvar objc-mode-abbrev-table nil |
| 509 | "Abbrev table in use in objc-mode buffers.") | 500 | "Abbreviation table used in objc-mode buffers.") |
| 510 | (define-abbrev-table 'objc-mode-abbrev-table ()) | 501 | (define-abbrev-table 'objc-mode-abbrev-table ()) |
| 511 | 502 | ||
| 512 | (defvar objc-mode-map () | 503 | (defvar objc-mode-map () |
| @@ -536,7 +527,7 @@ global and affect all future `c-mode' buffers." | |||
| 536 | ;; Support for Java | 527 | ;; Support for Java |
| 537 | 528 | ||
| 538 | (defvar java-mode-abbrev-table nil | 529 | (defvar java-mode-abbrev-table nil |
| 539 | "Abbrev table in use in java-mode buffers.") | 530 | "Abbreviation table used in java-mode buffers.") |
| 540 | (define-abbrev-table 'java-mode-abbrev-table ()) | 531 | (define-abbrev-table 'java-mode-abbrev-table ()) |
| 541 | 532 | ||
| 542 | (defvar java-mode-map () | 533 | (defvar java-mode-map () |
| @@ -563,5 +554,34 @@ global and affect all future `c-mode' buffers." | |||
| 563 | (c-mode-menu "Java")) | 554 | (c-mode-menu "Java")) |
| 564 | 555 | ||
| 565 | 556 | ||
| 557 | ;; Support for CORBA's IDL language | ||
| 558 | |||
| 559 | (defvar idl-mode-abbrev-table nil | ||
| 560 | "Abbreviation table used in idl-mode buffers.") | ||
| 561 | (define-abbrev-table 'idl-mode-abbrev-table ()) | ||
| 562 | |||
| 563 | (defvar idl-mode-map () | ||
| 564 | "Keymap used in idl-mode buffers.") | ||
| 565 | (if idl-mode-map | ||
| 566 | nil | ||
| 567 | (setq idl-mode-map (c-make-inherited-keymap)) | ||
| 568 | ;; additional bindings | ||
| 569 | (define-key idl-mode-map "/" 'c-electric-slash)) | ||
| 570 | |||
| 571 | (defvar idl-mode-syntax-table nil | ||
| 572 | "Syntax table used in idl-mode buffers.") | ||
| 573 | (if idl-mode-syntax-table | ||
| 574 | nil | ||
| 575 | (setq idl-mode-syntax-table (make-syntax-table)) | ||
| 576 | (c-populate-syntax-table idl-mode-syntax-table) | ||
| 577 | ;; add extra comment syntax | ||
| 578 | (c-setup-dual-comments idl-mode-syntax-table) | ||
| 579 | ) | ||
| 580 | |||
| 581 | (easy-menu-define c-idl-menu idl-mode-map "IDL Mode Commands" | ||
| 582 | (c-mode-menu "IDL")) | ||
| 583 | |||
| 584 | |||
| 585 | |||
| 566 | (provide 'cc-langs) | 586 | (provide 'cc-langs) |
| 567 | ;;; cc-langs.el ends here | 587 | ;;; cc-langs.el ends here |