comparison lisp/term.el @ 40468:4bfc983b38c3

(term-if-emacs19): Macro deleted. Callers changed to use progn instead.
author Richard M. Stallman <rms@gnu.org>
date Tue, 30 Oct 2001 00:27:25 +0000
parents 67b464da13ec
children 2f6568a7aee9
comparison
equal deleted inserted replaced
40467:e9c66842eb07 40468:4bfc983b38c3
656 (put 'term-input-filter-functions 'permanent-local t) 656 (put 'term-input-filter-functions 'permanent-local t)
657 (put 'term-scroll-to-bottom-on-output 'permanent-local t) 657 (put 'term-scroll-to-bottom-on-output 'permanent-local t)
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).
668 (defmacro term-if-xemacs (&rest forms) 664 (defmacro term-if-xemacs (&rest forms)
669 (if (term-is-xemacs) (cons 'progn forms))) 665 (if (term-is-xemacs) (cons 'progn forms)))
1062 ; menu-bar-final-items)) 1058 ; menu-bar-final-items))
1063 ) 1059 )
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)
1071 (setq newmap (make-sparse-keymap "Terminal")) 1067 (setq newmap (make-sparse-keymap "Terminal"))
1072 (define-key newmap [terminal-pager-enable] 1068 (define-key newmap [terminal-pager-enable]
1298 (setq term-raw-escape-map 1294 (setq term-raw-escape-map
1299 (copy-keymap (lookup-key (current-global-map) "\C-x"))) 1295 (copy-keymap (lookup-key (current-global-map) "\C-x")))
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
1307 (define-key term-raw-map [mouse-2] 'term-mouse-paste) 1303 (define-key term-raw-map [mouse-2] 'term-mouse-paste)
1308 (define-key term-raw-map [menu-bar terminal] term-terminal-menu) 1304 (define-key term-raw-map [menu-bar terminal] term-terminal-menu)
3366 (define-key map "D" 'term-pager-disable) 3362 (define-key map "D" 'term-pager-disable)
3367 (define-key map "<" 'term-pager-bob) 3363 (define-key map "<" 'term-pager-bob)
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)
3375 (setq tmp (make-sparse-keymap "More pages?")) 3371 (setq tmp (make-sparse-keymap "More pages?"))
3376 (define-key tmp [help] '("Help" . term-pager-help)) 3372 (define-key tmp [help] '("Help" . term-pager-help))