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

[John Wiegley]

Index: emacs/lisp/eshell/em-glob.el
diff -c emacs/lisp/eshell/em-glob.el:1.12 emacs/lisp/eshell/em-glob.el:1.13
*** emacs/lisp/eshell/em-glob.el:1.12   Sat May  8 12:39:01 2004
--- emacs/lisp/eshell/em-glob.el        Tue May 31 00:14:26 2005
***************
*** 265,273 ****
    (defvar matches)
    (defvar message-shown))
  
- ;; jww (1999-11-18): this function assumes that directory-sep-char is
- ;; a forward slash (/)
- 
  (defun eshell-glob-entries (path globs &optional recurse-p)
    "Glob the entries in PATHS, possibly recursing if RECURSE-P is non-nil."
    (let* ((entries (ignore-errors
--- 265,270 ----
***************
*** 303,313 ****
      ;; can't use `directory-file-name' because it strips away text
      ;; properties in the string
      (let ((len (1- (length incl))))
!       (if (eq (aref incl len) directory-sep-char)
          (setq incl (substring incl 0 len)))
        (when excl
        (setq len (1- (length excl)))
!       (if (eq (aref excl len) directory-sep-char)
            (setq excl (substring excl 0 len)))))
      (setq incl (eshell-glob-regexp incl)
          excl (and excl (eshell-glob-regexp excl)))
--- 300,310 ----
      ;; can't use `directory-file-name' because it strips away text
      ;; properties in the string
      (let ((len (1- (length incl))))
!       (if (eq (aref incl len) ?/)
          (setq incl (substring incl 0 len)))
        (when excl
        (setq len (1- (length excl)))
!       (if (eq (aref excl len) ?/)
            (setq excl (substring excl 0 len)))))
      (setq incl (eshell-glob-regexp incl)
          excl (and excl (eshell-glob-regexp excl)))
***************
*** 329,335 ****
      (while entries
        (setq name (car entries)
            len (length name)
!           isdir (eq (aref name (1- len)) directory-sep-char))
        (if (let ((fname (directory-file-name name)))
            (and (not (and excl (string-match excl fname)))
                 (string-match incl fname)))
--- 326,332 ----
      (while entries
        (setq name (car entries)
            len (length name)
!           isdir (eq (aref name (1- len)) ?/))
        (if (let ((fname (directory-file-name name)))
            (and (not (and excl (string-match excl fname)))
                 (string-match incl fname)))