diff options
| author | Miles Bader <miles@gnu.org> | 2006-03-13 12:19:58 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-03-13 12:19:58 +0000 |
| commit | 71936d675333ffe1a9638a755bccfd9006bd5404 (patch) | |
| tree | 8ec33690bc94d3654b17f4769313d5f2763227d5 /lisp/eshell | |
| parent | 57216976c5a20643ba59f8436e1177f66eb17cb7 (diff) | |
| parent | e8f10ddbda866838f77444a2d79efbba6122c918 (diff) | |
| download | emacs-71936d675333ffe1a9638a755bccfd9006bd5404.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-43
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 148-156)
- Update from CVS
- Merge from gnus--rel--5.10
- Remove nick-abbrevs stuff from rcirc.el
- rcirc.el update from Ryan Yeske
* gnus--rel--5.10 (patch 57)
- Copy/update icons from Gnus trunk
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/eshell.el | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index ed9e3e56c9e..cfc2f05b931 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -323,24 +323,6 @@ the tasks accomplished by such tools." (= (file-modes eshell-directory-name) eshell-private-directory-modes))) -(defcustom eshell-prefer-to-shell nil - "*If non-nil, \\[shell-command] will use Eshell instead of shell-mode." - :set (lambda (symbol value) - ;; modifying the global keymap directly is odious, but how - ;; else to achieve the takeover? - (if value - (progn - (define-key global-map [(meta ?!)] 'eshell-command) -;;; (define-key global-map [(meta ?|)] 'eshell-command-on-region) - ) - (define-key global-map [(meta ?!)] 'shell-command) -;;; (define-key global-map [(meta ?|)] 'shell-command-on-region) - ) - (set symbol value)) - :type 'boolean - :require 'eshell - :group 'eshell) - ;;;_* Running Eshell ;; ;; There are only three commands used to invoke Eshell. The first two |