[Emacs-diffs] Changes to emacs/lisp/eshell/eshell.el

[Richard M. Stallman]

Index: emacs/lisp/eshell/eshell.el
diff -u emacs/lisp/eshell/eshell.el:1.21 emacs/lisp/eshell/eshell.el:1.22
--- emacs/lisp/eshell/eshell.el:1.21    Mon Feb  6 11:57:57 2006
+++ emacs/lisp/eshell/eshell.el Sat Mar 11 15:13:19 2006
@@ -323,24 +323,6 @@
       (= (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