aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2019-10-28 16:13:28 +0100
committerStefan Kangas2019-10-28 16:17:41 +0100
commit9ee2caac4ddf3e790216a0353debef65e4a12c80 (patch)
treec92a11945b986c1d4cb5d50c2f2b46bd19eb3e0f
parent1f1ce5b3118abed0248f4a0bddd3f7538256dcac (diff)
downloademacs-9ee2caac4ddf3e790216a0353debef65e4a12c80.tar.gz
emacs-9ee2caac4ddf3e790216a0353debef65e4a12c80.zip
* lisp/eshell/em-term.el: Remove commented out XEmacs compat code.
-rw-r--r--lisp/eshell/em-term.el22
1 files changed, 8 insertions, 14 deletions
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 06d59cfc5b5..5c8cd4f0faf 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -258,17 +258,13 @@ the buffer."
258; (defun eshell-term-mouse-paste (click arg) 258; (defun eshell-term-mouse-paste (click arg)
259; "Insert the last stretch of killed text at the position clicked on." 259; "Insert the last stretch of killed text at the position clicked on."
260; (interactive "e\nP") 260; (interactive "e\nP")
261; (if (boundp 'xemacs-logo) 261; ;; Give temporary modes such as isearch a chance to turn off.
262; (eshell-term-send-raw-string 262; (run-hooks 'mouse-leave-buffer-hook)
263; (or (condition-case () (x-get-selection) (error ())) 263; (setq this-command 'yank)
264; (error "No selection available"))) 264; (eshell-term-send-raw-string
265; ;; Give temporary modes such as isearch a chance to turn off. 265; (current-kill (cond ((listp arg) 0)
266; (run-hooks 'mouse-leave-buffer-hook) 266; ((eq arg '-) -1)
267; (setq this-command 'yank) 267; (t (1- arg))))))
268; (eshell-term-send-raw-string
269; (current-kill (cond ((listp arg) 0)
270; ((eq arg '-) -1)
271; (t (1- arg)))))))
272 268
273; ;; Which would be better: "\e[A" or "\eOA"? readline accepts either. 269; ;; Which would be better: "\e[A" or "\eOA"? readline accepts either.
274; ;; For my configuration it's definitely better \eOA but YMMV. -mm 270; ;; For my configuration it's definitely better \eOA but YMMV. -mm
@@ -316,9 +312,7 @@ the buffer."
316; (setq eshell-term-raw-map map) 312; (setq eshell-term-raw-map map)
317; (setq eshell-term-raw-escape-map 313; (setq eshell-term-raw-escape-map
318; (copy-keymap (lookup-key (current-global-map) "\C-x"))) 314; (copy-keymap (lookup-key (current-global-map) "\C-x")))
319; (if (boundp 'xemacs-logo) 315; (define-key eshell-term-raw-map [mouse-2] 'eshell-term-mouse-paste)
320; (define-key eshell-term-raw-map [button2] 'eshell-term-mouse-paste)
321; (define-key eshell-term-raw-map [mouse-2] 'eshell-term-mouse-paste))
322; (define-key eshell-term-raw-map [up] 'eshell-term-send-up) 316; (define-key eshell-term-raw-map [up] 'eshell-term-send-up)
323; (define-key eshell-term-raw-map [down] 'eshell-term-send-down) 317; (define-key eshell-term-raw-map [down] 'eshell-term-send-down)
324; (define-key eshell-term-raw-map [right] 'eshell-term-send-right) 318; (define-key eshell-term-raw-map [right] 'eshell-term-send-right)