[Emacs-diffs] Changes to emacs/lisp/eshell/esh-util.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/05 07:07:13

Index: esh-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/esh-util.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- esh-util.el 28 Nov 2007 04:03:28 -0000      1.30
+++ esh-util.el 5 Dec 2007 07:07:12 -0000       1.31
@@ -22,19 +22,15 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
-(provide 'esh-util)
+;;; Commentary:
 
-(eval-when-compile (require 'esh-maint))
+;;; Code:
 
 (defgroup eshell-util nil
   "This is general utility code, meant for use by Eshell itself."
   :tag "General utilities"
   :group 'eshell)
 
-;;; Commentary:
-
-(require 'pp)
-
 ;;; User Variables:
 
 (defcustom eshell-stringify-t t
@@ -429,7 +425,9 @@
   ;; "args out of range" error in `sit-for', if this function
   ;; runs while point is in the minibuffer and the users attempt
   ;; to use completion.  Don't ask me.
-  (ignore-errors (sit-for 0 0)))
+  (condition-case nil
+      (sit-for 0 0)
+    (error nil)))
 
 (defun eshell-read-passwd-file (file)
   "Return an alist correlating gids to group names in FILE."
@@ -781,7 +779,7 @@
 ;     (or result
 ;      (file-attributes filename))))
 
-;;; Code:
+(provide 'esh-util)
 
 ;;; arch-tag: 70159778-5c7a-480a-bae4-3ad332fca19d
 ;;; esh-util.el ends here