diff options
| author | Stefan Kangas | 2019-09-14 15:15:27 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2019-10-01 20:25:11 +0200 |
| commit | b03b3549207fab66464e3223367f45dbe7ecf0ac (patch) | |
| tree | a910958909928fba924e792d9ba060f64ef6215a | |
| parent | 98bbded2b37b7608573b1a9c596f5c215257b7ad (diff) | |
| download | emacs-b03b3549207fab66464e3223367f45dbe7ecf0ac.tar.gz emacs-b03b3549207fab66464e3223367f45dbe7ecf0ac.zip | |
Remove XEmacs compat code from term.el (Bug#37524)
* lisp/term.el (term-mode-map, term-raw-map, term-mouse-paste):
Remove XEmacs compat code.
| -rw-r--r-- | lisp/term.el | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/lisp/term.el b/lisp/term.el index 66ae470239a..43239d9b6cd 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -587,10 +587,9 @@ executed once, when the buffer is created." | |||
| 587 | (define-key map "\en" 'term-next-input) | 587 | (define-key map "\en" 'term-next-input) |
| 588 | (define-key map "\er" 'term-previous-matching-input) | 588 | (define-key map "\er" 'term-previous-matching-input) |
| 589 | (define-key map "\es" 'term-next-matching-input) | 589 | (define-key map "\es" 'term-next-matching-input) |
| 590 | (unless (featurep 'xemacs) | 590 | (define-key map [?\A-\M-r] |
| 591 | (define-key map [?\A-\M-r] | 591 | 'term-previous-matching-input-from-input) |
| 592 | 'term-previous-matching-input-from-input) | 592 | (define-key map [?\A-\M-s] 'term-next-matching-input-from-input) |
| 593 | (define-key map [?\A-\M-s] 'term-next-matching-input-from-input)) | ||
| 594 | (define-key map "\e\C-l" 'term-show-output) | 593 | (define-key map "\e\C-l" 'term-show-output) |
| 595 | (define-key map "\C-m" 'term-send-input) | 594 | (define-key map "\C-m" 'term-send-input) |
| 596 | (define-key map "\C-d" 'term-delchar-or-maybe-eof) | 595 | (define-key map "\C-d" 'term-delchar-or-maybe-eof) |
| @@ -827,9 +826,7 @@ is buffer-local." | |||
| 827 | 826 | ||
| 828 | ;; Added nearly all the 'gray keys' -mm | 827 | ;; Added nearly all the 'gray keys' -mm |
| 829 | 828 | ||
| 830 | (if (featurep 'xemacs) | 829 | (define-key map [mouse-2] 'term-mouse-paste) |
| 831 | (define-key map [button2] 'term-mouse-paste) | ||
| 832 | (define-key map [mouse-2] 'term-mouse-paste)) | ||
| 833 | (define-key map [up] 'term-send-up) | 830 | (define-key map [up] 'term-send-up) |
| 834 | (define-key map [down] 'term-send-down) | 831 | (define-key map [down] 'term-send-down) |
| 835 | (define-key map [right] 'term-send-right) | 832 | (define-key map [right] 'term-send-right) |
| @@ -1235,15 +1232,11 @@ without any interpretation." | |||
| 1235 | (defun term-mouse-paste (click) | 1232 | (defun term-mouse-paste (click) |
| 1236 | "Insert the primary selection at the position clicked on." | 1233 | "Insert the primary selection at the position clicked on." |
| 1237 | (interactive "e") | 1234 | (interactive "e") |
| 1238 | (if (featurep 'xemacs) | 1235 | ;; Give temporary modes such as isearch a chance to turn off. |
| 1239 | (term-send-raw-string | 1236 | (run-hooks 'mouse-leave-buffer-hook) |
| 1240 | (or (condition-case () (x-get-selection) (error ())) | 1237 | (setq this-command 'yank) |
| 1241 | (error "No selection available"))) | 1238 | (mouse-set-point click) |
| 1242 | ;; Give temporary modes such as isearch a chance to turn off. | 1239 | (term-send-raw-string (gui-get-primary-selection))) |
| 1243 | (run-hooks 'mouse-leave-buffer-hook) | ||
| 1244 | (setq this-command 'yank) | ||
| 1245 | (mouse-set-point click) | ||
| 1246 | (term-send-raw-string (gui-get-primary-selection)))) | ||
| 1247 | 1240 | ||
| 1248 | (defun term-paste () | 1241 | (defun term-paste () |
| 1249 | "Insert the last stretch of killed text at point." | 1242 | "Insert the last stretch of killed text at point." |