comparison lisp/progmodes/cc-langs.el @ 19805:e804ac04eec1

(c-mode-base-map): Don't define C-c C-e here. (c-mode-map, c++-mode-map): Define C-c C-e here. (objc-mode-map): Define C-c C-e, not /. (java-mode-map, idl-mode-map): Don't define /.
author Richard M. Stallman <rms@gnu.org>
date Mon, 08 Sep 1997 03:20:17 +0000
parents 3ad777918b6c
children cd9968dc162a
comparison
equal deleted inserted replaced
19804:37e25ff5a7f1 19805:e804ac04eec1
5 ;; Authors: 1992-1997 Barry A. Warsaw 5 ;; Authors: 1992-1997 Barry A. Warsaw
6 ;; 1987 Dave Detlefs and Stewart Clamen 6 ;; 1987 Dave Detlefs and Stewart Clamen
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.16 10 ;; Version: 5.17
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.
14 14
15 ;; GNU Emacs is free software; you can redistribute it and/or modify 15 ;; GNU Emacs is free software; you can redistribute it and/or modify
373 ;; TBD: where if anywhere, to put c-backward|forward-into-nomenclature 373 ;; TBD: where if anywhere, to put c-backward|forward-into-nomenclature
374 (define-key c-mode-base-map "\C-c\C-a" 'c-toggle-auto-state) 374 (define-key c-mode-base-map "\C-c\C-a" 'c-toggle-auto-state)
375 (define-key c-mode-base-map "\C-c\C-b" 'c-submit-bug-report) 375 (define-key c-mode-base-map "\C-c\C-b" 'c-submit-bug-report)
376 (define-key c-mode-base-map "\C-c\C-c" 'comment-region) 376 (define-key c-mode-base-map "\C-c\C-c" 'comment-region)
377 (define-key c-mode-base-map "\C-c\C-d" 'c-toggle-hungry-state) 377 (define-key c-mode-base-map "\C-c\C-d" 'c-toggle-hungry-state)
378 (define-key c-mode-base-map "\C-c\C-e" 'c-macro-expand)
379 (define-key c-mode-base-map "\C-c\C-o" 'c-set-offset) 378 (define-key c-mode-base-map "\C-c\C-o" 'c-set-offset)
380 (define-key c-mode-base-map "\C-c\C-s" 'c-show-syntactic-information) 379 (define-key c-mode-base-map "\C-c\C-s" 'c-show-syntactic-information)
381 (define-key c-mode-base-map "\C-c\C-t" 'c-toggle-auto-hungry-state) 380 (define-key c-mode-base-map "\C-c\C-t" 'c-toggle-auto-hungry-state)
382 (define-key c-mode-base-map "\C-c." 'c-set-style) 381 (define-key c-mode-base-map "\C-c." 'c-set-style)
383 ;; conflicts with OOBR 382 ;; conflicts with OOBR
427 "Keymap used in c-mode buffers.") 426 "Keymap used in c-mode buffers.")
428 (if c-mode-map 427 (if c-mode-map
429 nil 428 nil
430 (setq c-mode-map (c-make-inherited-keymap)) 429 (setq c-mode-map (c-make-inherited-keymap))
431 ;; add bindings which are only useful for C 430 ;; add bindings which are only useful for C
431 (define-key c-mode-map "\C-c\C-e" 'c-macro-expand)
432 ) 432 )
433 433
434 ;;;###autoload 434 ;;;###autoload
435 (defvar c-mode-syntax-table nil 435 (defvar c-mode-syntax-table nil
436 "Syntax table used in c-mode buffers.") 436 "Syntax table used in c-mode buffers.")
453 "Keymap used in c++-mode buffers.") 453 "Keymap used in c++-mode buffers.")
454 (if c++-mode-map 454 (if c++-mode-map
455 nil 455 nil
456 (setq c++-mode-map (c-make-inherited-keymap)) 456 (setq c++-mode-map (c-make-inherited-keymap))
457 ;; add bindings which are only useful for C++ 457 ;; add bindings which are only useful for C++
458 (define-key c++-mode-map "\C-c:" 'c-scope-operator) 458 (define-key c++-mode-map "\C-c\C-e" 'c-macro-expand)
459 (define-key c++-mode-map "<" 'c-electric-lt-gt) 459 (define-key c++-mode-map "\C-c:" 'c-scope-operator)
460 (define-key c++-mode-map ">" 'c-electric-lt-gt)) 460 (define-key c++-mode-map "<" 'c-electric-lt-gt)
461 (define-key c++-mode-map ">" 'c-electric-lt-gt))
461 462
462 ;;;###autoload 463 ;;;###autoload
463 (defvar c++-mode-syntax-table nil 464 (defvar c++-mode-syntax-table nil
464 "Syntax table used in c++-mode buffers.") 465 "Syntax table used in c++-mode buffers.")
465 (if c++-mode-syntax-table 466 (if c++-mode-syntax-table
489 "Keymap used in objc-mode buffers.") 490 "Keymap used in objc-mode buffers.")
490 (if objc-mode-map 491 (if objc-mode-map
491 nil 492 nil
492 (setq objc-mode-map (c-make-inherited-keymap)) 493 (setq objc-mode-map (c-make-inherited-keymap))
493 ;; add bindings which are only useful for Objective-C 494 ;; add bindings which are only useful for Objective-C
494 (define-key objc-mode-map "/" 'c-electric-slash)) 495 (define-key objc-mode-map "\C-c\C-e" 'c-macro-expand))
495 496
496 ;;;###autoload 497 ;;;###autoload
497 (defvar objc-mode-syntax-table nil 498 (defvar objc-mode-syntax-table nil
498 "Syntax table used in objc-mode buffers.") 499 "Syntax table used in objc-mode buffers.")
499 (if objc-mode-syntax-table 500 (if objc-mode-syntax-table
517 "Keymap used in java-mode buffers.") 518 "Keymap used in java-mode buffers.")
518 (if java-mode-map 519 (if java-mode-map
519 nil 520 nil
520 (setq java-mode-map (c-make-inherited-keymap)) 521 (setq java-mode-map (c-make-inherited-keymap))
521 ;; add bindings which are only useful for Java 522 ;; add bindings which are only useful for Java
522 (define-key java-mode-map "/" 'c-electric-slash)) 523 )
523 524
524 ;;;###autoload 525 ;;;###autoload
525 (defvar java-mode-syntax-table nil 526 (defvar java-mode-syntax-table nil
526 "Syntax table used in java-mode buffers.") 527 "Syntax table used in java-mode buffers.")
527 (if java-mode-syntax-table 528 (if java-mode-syntax-table
542 (defvar idl-mode-map () 543 (defvar idl-mode-map ()
543 "Keymap used in idl-mode buffers.") 544 "Keymap used in idl-mode buffers.")
544 (if idl-mode-map 545 (if idl-mode-map
545 nil 546 nil
546 (setq idl-mode-map (c-make-inherited-keymap)) 547 (setq idl-mode-map (c-make-inherited-keymap))
547 ;; additional bindings 548 ;; add bindings which are only useful for IDL
548 (define-key idl-mode-map "/" 'c-electric-slash)) 549 )
549 550
550 ;;;###autoload 551 ;;;###autoload
551 (defvar idl-mode-syntax-table nil 552 (defvar idl-mode-syntax-table nil
552 "Syntax table used in idl-mode buffers.") 553 "Syntax table used in idl-mode buffers.")
553 (if idl-mode-syntax-table 554 (if idl-mode-syntax-table