diff options
author | Miles Bader <[email protected]> | 2007-12-06 09:51:45 +0000 |
---|---|---|
committer | Miles Bader <[email protected]> | 2007-12-06 09:51:45 +0000 |
commit | 0bd508417142ff377f34aec8dcec9438d9175c2c (patch) | |
tree | 4d60fe09e5cebf7d79766b11e9cda8cc1c9dbb9b /lisp/eshell/esh-mode.el | |
parent | 98fe991da804a42f53f6a5e84cd5eab18a82e181 (diff) | |
parent | 9fb1ba8090da3528de56158a79bd3527d31c7f2f (diff) |
Merge from emacs--devo--0
Revision: [email protected]/emacs--unicode--0--patch-294
Diffstat (limited to 'lisp/eshell/esh-mode.el')
-rw-r--r-- | lisp/eshell/esh-mode.el | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 8b7338f883..eb618f6b6b 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -22,15 +22,6 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. -(provide 'esh-mode) - -(eval-when-compile (require 'esh-maint)) - -(defgroup eshell-mode nil - "This module contains code for handling input from the user." - :tag "User interface" - :group 'eshell) - ;;; Commentary: ;; Basically, Eshell is used just like shell mode (<M-x shell>). The @@ -68,11 +59,19 @@ ;; ;; @ <C-c C-b> will move backward a complete shell argument. +(provide 'esh-mode) + +(eval-when-compile (require 'esh-util)) (require 'esh-module) (require 'esh-cmd) (require 'esh-io) (require 'esh-var) +(defgroup eshell-mode nil + "This module contains code for handling input from the user." + :tag "User interface" + :group 'eshell) + ;;; User Variables: (defcustom eshell-mode-unload-hook nil @@ -222,11 +221,6 @@ This is used by `eshell-watch-for-password-prompt'." (define-abbrev-table 'eshell-mode-abbrev-table ()) -(eval-when-compile - (unless (eshell-under-xemacs-p) - (defalias 'characterp 'ignore) - (defalias 'char-int 'ignore))) - (if (not eshell-mode-syntax-table) (let ((i 0)) (setq eshell-mode-syntax-table (make-syntax-table)) @@ -269,7 +263,7 @@ This is used by `eshell-watch-for-password-prompt'." (modify-syntax-entry ?\[ "(] " eshell-mode-syntax-table) (modify-syntax-entry ?\] ")[ " eshell-mode-syntax-table) ;; All non-word multibyte characters should be `symbol'. - (if (eshell-under-xemacs-p) + (if (featurep 'xemacs) (map-char-table (function (lambda (key val) @@ -470,7 +464,7 @@ This is used by `eshell-watch-for-password-prompt'." (eshell-deftest mode command-running-p "Modeline shows no command running" - (or (eshell-under-xemacs-p) + (or (featurep 'xemacs) (not eshell-status-in-modeline) (and (memq 'eshell-command-running-string mode-line-format) (equal eshell-command-running-string "--")))) |