aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Tromey1994-08-21 03:54:45 +0000
committerTom Tromey1994-08-21 03:54:45 +0000
commit31cc18672a16d801a348d464c152d73d3fb29efc (patch)
treea47ec20daae6b65c9c279d9cfb2e0ad0f4ce89c0
parent8bf761ce6fc7cc756833a3e07a43a9d68c87a59f (diff)
downloademacs-31cc18672a16d801a348d464c152d73d3fb29efc.tar.gz
emacs-31cc18672a16d801a348d464c152d73d3fb29efc.zip
Keybindings don't overshadown comint bindings.
-rw-r--r--lisp/progmodes/tcl.el33
1 files changed, 18 insertions, 15 deletions
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index e33a216689c..c12ca6da51c 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -6,7 +6,7 @@
6;; Author: Tom Tromey <tromey@busco.lanl.gov> 6;; Author: Tom Tromey <tromey@busco.lanl.gov>
7;; Chris Lindblad <cjl@lcs.mit.edu> 7;; Chris Lindblad <cjl@lcs.mit.edu>
8;; Keywords: languages tcl modes 8;; Keywords: languages tcl modes
9;; Version: $Revision: 1.21 $ 9;; Version: $Revision: 1.22 $
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12 12
@@ -51,7 +51,7 @@
51;; LCD Archive Entry: 51;; LCD Archive Entry:
52;; tcl|Tom Tromey|tromey@busco.lanl.gov| 52;; tcl|Tom Tromey|tromey@busco.lanl.gov|
53;; Major mode for editing Tcl| 53;; Major mode for editing Tcl|
54;; $Date: 1994/07/14 22:49:21 $|$Revision: 1.21 $|~/modes/tcl.el.Z| 54;; $Date: 1994/07/26 00:46:07 $|$Revision: 1.22 $|~/modes/tcl.el.Z|
55 55
56;; CUSTOMIZATION NOTES: 56;; CUSTOMIZATION NOTES:
57;; * tcl-proc-list can be used to customize a list of things that 57;; * tcl-proc-list can be used to customize a list of things that
@@ -65,6 +65,9 @@
65 65
66;; Change log: 66;; Change log:
67;; $Log: tcl.el,v $ 67;; $Log: tcl.el,v $
68;; Revision 1.22 1994/07/26 00:46:07 tromey
69;; Emacs 18 changes from Carl Witty.
70;;
68;; Revision 1.21 1994/07/14 22:49:21 tromey 71;; Revision 1.21 1994/07/14 22:49:21 tromey
69;; Added ";;;###autoload" comments where appropriate. 72;; Added ";;;###autoload" comments where appropriate.
70;; 73;;
@@ -263,7 +266,7 @@
263 (require 'imenu)) 266 (require 'imenu))
264 ())) 267 ()))
265 268
266(defconst tcl-version "$Revision: 1.21 $") 269(defconst tcl-version "$Revision: 1.22 $")
267(defconst tcl-maintainer "Tom Tromey <tromey@busco.lanl.gov>") 270(defconst tcl-maintainer "Tom Tromey <tromey@busco.lanl.gov>")
268 271
269;; 272;;
@@ -436,12 +439,12 @@ quoted for Tcl.")
436 (define-key tcl-mode-map "\C-c\C-b" 'tcl-submit-bug-report) 439 (define-key tcl-mode-map "\C-c\C-b" 'tcl-submit-bug-report)
437 (and (fboundp 'comment-region) 440 (and (fboundp 'comment-region)
438 (define-key tcl-mode-map "\C-c\C-c" 'comment-region)) 441 (define-key tcl-mode-map "\C-c\C-c" 'comment-region))
439 (define-key tcl-mode-map "\C-c\C-d" 'tcl-help-on-word) 442 (define-key tcl-mode-map "\C-c\C-i" 'tcl-help-on-word)
440 (define-key tcl-mode-map "\C-c\C-e" 'tcl-eval-defun) 443 (define-key tcl-mode-map "\C-c\C-v" 'tcl-eval-defun)
441 (define-key tcl-mode-map "\C-c\C-l" 'tcl-load-file) 444 (define-key tcl-mode-map "\C-c\C-f" 'tcl-load-file)
442 (define-key tcl-mode-map "\C-c\C-p" 'inferior-tcl) 445 (define-key tcl-mode-map "\C-c\C-t" 'inferior-tcl)
443 (define-key tcl-mode-map "\C-c\C-r" 'tcl-eval-region) 446 (define-key tcl-mode-map "\C-c\C-x" 'tcl-eval-region)
444 (define-key tcl-mode-map "\C-c\C-z" 'switch-to-tcl) 447 (define-key tcl-mode-map "\C-c\C-s" 'switch-to-tcl)
445 448
446 ;; Make menus. 449 ;; Make menus.
447 (if tcl-using-emacs-19 450 (if tcl-using-emacs-19
@@ -458,12 +461,12 @@ quoted for Tcl.")
458 (define-key inferior-tcl-mode-map "\177" 'backward-delete-char-untabify) 461 (define-key inferior-tcl-mode-map "\177" 'backward-delete-char-untabify)
459 (define-key inferior-tcl-mode-map "\M-\C-x" 'tcl-eval-defun) 462 (define-key inferior-tcl-mode-map "\M-\C-x" 'tcl-eval-defun)
460 (define-key inferior-tcl-mode-map "\C-c\C-b" 'tcl-submit-bug-report) 463 (define-key inferior-tcl-mode-map "\C-c\C-b" 'tcl-submit-bug-report)
461 (define-key inferior-tcl-mode-map "\C-c\C-d" 'tcl-help-on-word) 464 (define-key inferior-tcl-mode-map "\C-c\C-i" 'tcl-help-on-word)
462 (define-key inferior-tcl-mode-map "\C-c\C-e" 'tcl-eval-defun) 465 (define-key inferior-tcl-mode-map "\C-c\C-v" 'tcl-eval-defun)
463 (define-key inferior-tcl-mode-map "\C-c\C-l" 'tcl-load-file) 466 (define-key inferior-tcl-mode-map "\C-c\C-f" 'tcl-load-file)
464 (define-key inferior-tcl-mode-map "\C-c\C-p" 'inferior-tcl) 467 (define-key inferior-tcl-mode-map "\C-c\C-t" 'inferior-tcl)
465 (define-key inferior-tcl-mode-map "\C-c\C-r" 'tcl-eval-region) 468 (define-key inferior-tcl-mode-map "\C-c\C-x" 'tcl-eval-region)
466 (define-key inferior-tcl-mode-map "\C-c\C-z" 'switch-to-tcl)) 469 (define-key inferior-tcl-mode-map "\C-c\C-s" 'switch-to-tcl))
467 470
468(if tcl-mode-map 471(if tcl-mode-map
469 () 472 ()