From a3269bc45f343c405986126c842361db10589476 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 17 Nov 2007 17:35:09 +0000 Subject: * eshell/esh-util.el (eshell-under-xemacs-p): Remove. * eshell/esh-mode.el (eshell-mode-syntax-table) (command-running-p): * eshell/esh-ext.el (eshell-external-command): * eshell/esh-cmd.el (require): * eshell/em-unix.el (eshell-plain-locate-behavior): * eshell/em-cmpl.el (eshell-cmpl-initialize): Replace eshell-under-xemacs-p with (featurep 'xemacs). * eshell/esh-mode.el (characterp,char-int): Remove unused conditional defaliases. * pcomplete.el (pcomplete-event-matches-key-specifier-p): Rename from event-matches-key-specifier-p, define unconditionally. (event-basic-type): Remove unused defalias. (pcomplete-show-completions): Use pcomplete-event-matches-key-specifier-p. * mh-e.el (mh-xemacs-flag): Remove. (mh-min-colors-defined-flag): * mh-xface.el (mh-show-xface-function): * mh-utils.el (mh-colors-available-p): * mh-show.el (mh-show-mode): * mh-gnus.el (mh-gnus-local-map-property): * mh-folder.el (mh-folder-mode-map) (mh-remove-xemacs-horizontal-scrollbar, mh-folder-mode): * mh-comp.el (mh-insert-x-mailer): Replace uses of mh-xemacs-flag with (featurep 'xemacs). --- lisp/eshell/esh-ext.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/eshell/esh-ext.el') diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 11090f97b83..7e3e8ac9e09 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -211,7 +211,7 @@ causing the user to wonder if anything's really going on..." (find-file-name-handler default-directory 'shell-command)))) (if (and handler - (not (and (eshell-under-xemacs-p) + (not (and (featurep 'xemacs) (eq handler 'dired-handler-fn)))) (eshell-remote-command handler command args)) (let ((interp (eshell-find-interpreter command))) -- cgit v1.2.3 From 4e6cc05cc91d58358b73380d61eec1a0b97cb33c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 5 Dec 2007 07:08:55 +0000 Subject: Require individual files if needed when compiling, rather than esh-maint. Collect any require statements. Leave provide at start. Move any commentary to start. --- lisp/eshell/esh-ext.el | 23 ++++++++++++----------- lisp/eshell/esh-mode.el | 17 ++++++++--------- lisp/eshell/esh-opt.el | 6 +++--- lisp/eshell/esh-proc.el | 8 +++++--- 4 files changed, 28 insertions(+), 26 deletions(-) (limited to 'lisp/eshell/esh-ext.el') diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 7e3e8ac9e09..b3fc5c30bbe 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -22,17 +22,6 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. -(provide 'esh-ext) - -(eval-when-compile (require 'esh-maint)) -(require 'esh-util) - -(defgroup eshell-ext nil - "External commands are invoked when operating system executables are -loaded into memory, thus beginning a new process." - :tag "External commands" - :group 'eshell) - ;;; Commentary: ;; To force a command to invoked external, either provide an explicit @@ -43,6 +32,18 @@ loaded into memory, thus beginning a new process." ;; /bin/grep ; will definitely invoke /bin/grep ;; *grep ; will also invoke /bin/grep +(provide 'esh-ext) + +(eval-when-compile + (require 'esh-cmd)) +(require 'esh-util) + +(defgroup eshell-ext nil + "External commands are invoked when operating system executables are +loaded into memory, thus beginning a new process." + :tag "External commands" + :group 'eshell) + ;;; User Variables: (defcustom eshell-ext-load-hook '(eshell-ext-initialize) diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index b30c1a80539..180515b7b79 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 (). The @@ -68,11 +59,19 @@ ;; ;; @ 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 diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 121f568a9c4..953284e5392 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -22,9 +22,11 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. +;;; Commentary: + (provide 'esh-opt) -(eval-when-compile (require 'esh-maint)) +(eval-when-compile (require 'esh-ext)) (defgroup eshell-opt nil "The options processing code handles command argument parsing for @@ -32,8 +34,6 @@ Eshell commands implemented in Lisp." :tag "Command options processing" :group 'eshell) -;;; Commentary: - ;;; User Functions: (defmacro eshell-eval-using-options (name macro-args diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 7338756e3f8..c679ea7440a 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -22,9 +22,13 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. +;;; Commentary: + (provide 'esh-proc) -(eval-when-compile (require 'esh-maint)) +(eval-when-compile + (require 'eshell) + (require 'esh-util)) (defgroup eshell-proc nil "When Eshell invokes external commands, it always does so @@ -33,8 +37,6 @@ finish." :tag "Process management" :group 'eshell) -;;; Commentary: - ;;; User Variables: (defcustom eshell-proc-load-hook '(eshell-proc-initialize) -- cgit v1.2.3