X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/affbf6477576c38d98111b55fbb1eb5b13d1a735..ab5796a9f97180707734a81320e3eb81937281fe:/lisp/eshell/em-pred.el

diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index f2a5a30733..3be32fde10 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -1,6 +1,8 @@
-;;; em-pred --- argument predicates and modifiers (ala zsh)
+;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
-;; Copyright (C) 1999, 2000 Free Sofware Foundation
+;; Copyright (C) 1999, 2000 Free Software Foundation
+
+;; Author: John Wiegley <johnw@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
@@ -56,6 +58,8 @@ ordinary strings."
 ;; See the zsh docs for more on the syntax ([(zsh.info)Filename
 ;; Generation]).
 
+;;; Code:
+
 ;;; User Variables:
 
 (defcustom eshell-pred-load-hook '(eshell-pred-initialize)
@@ -214,7 +218,7 @@ FOR SINGLE ARGUMENTS, or each argument of a list of strings:
   q  escape special characters
 
   S       split string at any whitespace character
-  S/PAT/  split string at each occurance of PAT
+  S/PAT/  split string at each occurrence of PAT
 
 FOR LISTS OF ARGUMENTS:
   o  sort alphabetically
@@ -228,7 +232,7 @@ FOR LISTS OF ARGUMENTS:
   x/PAT/  exclude all members matching PAT
 
   s/pat/match/  substitute PAT with MATCH
-  g/pat/match/  substitute PAT with MATCH for all occurances
+  g/pat/match/  substitute PAT with MATCH for all occurrences
 
 EXAMPLES:
   *.c(:o)  sorted list of .c files")
@@ -251,7 +255,6 @@ EXAMPLES:
 
 (defun eshell-pred-initialize ()
   "Initialize the predicate/modifier code."
-  (make-local-hook 'eshell-parse-argument-hook)
   (add-hook 'eshell-parse-argument-hook
 	    'eshell-parse-arg-modifier t t)
   (define-key eshell-command-map [(meta ?q)] 'eshell-display-predicate-help)
@@ -464,7 +467,7 @@ that 'ls -l' will show in the first column of its display. "
 	(forward-char)
       (setq type ?%)))
   `(lambda (file)
-     (let ((attrs (file-attributes (directory-file-name file))))
+     (let ((attrs (eshell-file-attributes (directory-file-name file))))
        (if attrs
 	   (memq (aref (nth 8 attrs) 0)
 		 ,(if (eq type ?%)
@@ -489,7 +492,7 @@ that 'ls -l' will show in the first column of its display. "
     (setq amount (string-to-number (match-string 0)))
     (goto-char (match-end 0))
     `(lambda (file)
-       (let ((attrs (file-attributes file)))
+       (let ((attrs (eshell-file-attributes file)))
 	 (if attrs
 	     (,(if (eq qual ?-)
 		   '<
@@ -518,7 +521,7 @@ that 'ls -l' will show in the first column of its display. "
     (setq amount (* (string-to-number (match-string 0)) quantum))
     (goto-char (match-end 0))
     `(lambda (file)
-       (let ((attrs (file-attributes file)))
+       (let ((attrs (eshell-file-attributes file)))
 	 (if attrs
 	     (,(if (eq qual ?-)
 		   '<
@@ -597,6 +600,5 @@ that 'ls -l' will show in the first column of its display. "
 	 (lambda (str)
 	   (split-string str ,sep))) lst))))
 
-;;; Code:
-
+;;; arch-tag: 8b5ce022-17f3-4c40-93c7-5faafaa63f31
 ;;; em-pred.el ends here