# HG changeset patch # User Richard M. Stallman # Date 1004401645 0 # Node ID 4bfc983b38c329798b4a65ea1940e94146bca6fa # Parent e9c66842eb072e37684113c9cbf7e2a890496671 (term-if-emacs19): Macro deleted. Callers changed to use progn instead. diff -r e9c66842eb07 -r 4bfc983b38c3 lisp/term.el --- a/lisp/term.el Tue Oct 30 00:24:12 2001 +0000 +++ b/lisp/term.el Tue Oct 30 00:27:25 2001 +0000 @@ -658,10 +658,6 @@ (put 'term-scroll-show-maximum-output 'permanent-local t) (put 'term-ptyp 'permanent-local t) -;; Do FORMS if running under Emacs 19 or later. -(defmacro term-if-emacs19 (&rest forms) - (if (string-match "^\\(19\\|[2-9][0-9]\\)" emacs-version) - (cons 'progn forms))) ;; True if running under XEmacs (previously Lucid Emacs). (defmacro term-is-xemacs () '(string-match "Lucid" emacs-version)) ;; Do FORM if running under XEmacs (previously Lucid Emacs). @@ -1064,7 +1060,7 @@ ;; Menu bars: (term-ifnot-xemacs - (term-if-emacs19 + (progn ;; terminal: (let (newmap) @@ -1300,7 +1296,7 @@ ;;; Added nearly all the 'grey keys' -mm - (term-if-emacs19 + (progn (term-if-xemacs (define-key term-raw-map [button2] 'term-mouse-paste)) (term-ifnot-xemacs @@ -3368,7 +3364,7 @@ (define-key map ">" 'term-pager-eob) ;; Add menu bar. - (term-if-emacs19 + (progn (term-ifnot-xemacs (define-key map [menu-bar terminal] term-terminal-menu) (define-key map [menu-bar signals] term-signals-menu)