diff options
| author | Joakim Verona | 2010-09-06 11:56:58 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-09-06 11:56:58 +0200 |
| commit | 5f09724dbf7335f829e435ecf104071074e309e1 (patch) | |
| tree | e005648ecd6c7b52b325f8272a39ee03507dfc7a /lisp/eshell | |
| parent | 542dbe5c80102f83226baf87d9bae724ed8efcfb (diff) | |
| parent | ed96ace9289c2e04db3e8fc63321fde248c3f3f8 (diff) | |
| download | emacs-5f09724dbf7335f829e435ecf104071074e309e1.tar.gz emacs-5f09724dbf7335f829e435ecf104071074e309e1.zip | |
merge from upstream
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-term.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index 8662dd9fffb..826e7ec0d05 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el | |||
| @@ -187,8 +187,7 @@ allowed." | |||
| 187 | ; (if (boundp 'xemacs-logo) | 187 | ; (if (boundp 'xemacs-logo) |
| 188 | ; (eshell-term-send-raw-string | 188 | ; (eshell-term-send-raw-string |
| 189 | ; (or (condition-case () (x-get-selection) (error ())) | 189 | ; (or (condition-case () (x-get-selection) (error ())) |
| 190 | ; (x-get-cutbuffer) | 190 | ; (error "No selection available"))) |
| 191 | ; (error "No selection or cut buffer available"))) | ||
| 192 | ; ;; Give temporary modes such as isearch a chance to turn off. | 191 | ; ;; Give temporary modes such as isearch a chance to turn off. |
| 193 | ; (run-hooks 'mouse-leave-buffer-hook) | 192 | ; (run-hooks 'mouse-leave-buffer-hook) |
| 194 | ; (setq this-command 'yank) | 193 | ; (setq this-command 'yank) |