aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/term.el10
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/term.el b/lisp/term.el
index f4591e16f4e..7410edc5652 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -658,10 +658,6 @@ Buffer local variable.")
658(put 'term-scroll-show-maximum-output 'permanent-local t) 658(put 'term-scroll-show-maximum-output 'permanent-local t)
659(put 'term-ptyp 'permanent-local t) 659(put 'term-ptyp 'permanent-local t)
660 660
661;; Do FORMS if running under Emacs 19 or later.
662(defmacro term-if-emacs19 (&rest forms)
663 (if (string-match "^\\(19\\|[2-9][0-9]\\)" emacs-version)
664 (cons 'progn forms)))
665;; True if running under XEmacs (previously Lucid Emacs). 661;; True if running under XEmacs (previously Lucid Emacs).
666(defmacro term-is-xemacs () '(string-match "Lucid" emacs-version)) 662(defmacro term-is-xemacs () '(string-match "Lucid" emacs-version))
667;; Do FORM if running under XEmacs (previously Lucid Emacs). 663;; Do FORM if running under XEmacs (previously Lucid Emacs).
@@ -1064,7 +1060,7 @@ Entry to this mode runs the hooks on term-mode-hook"
1064 1060
1065;; Menu bars: 1061;; Menu bars:
1066(term-ifnot-xemacs 1062(term-ifnot-xemacs
1067 (term-if-emacs19 1063 (progn
1068 1064
1069 ;; terminal: 1065 ;; terminal:
1070 (let (newmap) 1066 (let (newmap)
@@ -1300,7 +1296,7 @@ intervention from Emacs, except for the escape character (usually C-c)."
1300 1296
1301;;; Added nearly all the 'grey keys' -mm 1297;;; Added nearly all the 'grey keys' -mm
1302 1298
1303 (term-if-emacs19 1299 (progn
1304 (term-if-xemacs 1300 (term-if-xemacs
1305 (define-key term-raw-map [button2] 'term-mouse-paste)) 1301 (define-key term-raw-map [button2] 'term-mouse-paste))
1306 (term-ifnot-xemacs 1302 (term-ifnot-xemacs
@@ -3368,7 +3364,7 @@ The top-most line is line 0."
3368 (define-key map ">" 'term-pager-eob) 3364 (define-key map ">" 'term-pager-eob)
3369 3365
3370 ;; Add menu bar. 3366 ;; Add menu bar.
3371 (term-if-emacs19 3367 (progn
3372 (term-ifnot-xemacs 3368 (term-ifnot-xemacs
3373 (define-key map [menu-bar terminal] term-terminal-menu) 3369 (define-key map [menu-bar terminal] term-terminal-menu)
3374 (define-key map [menu-bar signals] term-signals-menu) 3370 (define-key map [menu-bar signals] term-signals-menu)