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

[John Wiegley]

Index: emacs/lisp/eshell/esh-util.el
diff -c emacs/lisp/eshell/esh-util.el:1.20 emacs/lisp/eshell/esh-util.el:1.21
*** emacs/lisp/eshell/esh-util.el:1.20  Mon Sep  1 15:45:23 2003
--- emacs/lisp/eshell/esh-util.el       Tue May 31 00:14:26 2005
***************
*** 253,266 ****
        parts)
      (if (and (eshell-under-windows-p)
             (> len 2)
!            (eq (aref path 0) directory-sep-char)
!            (eq (aref path 1) directory-sep-char))
        (setq i 2))
      (while (< i len)
!       (if (and (eq (aref path i) directory-sep-char)
               (not (get-text-property i 'escaped path)))
!         (setq parts (cons (if (= li i)
!                               (char-to-string directory-sep-char)
                              (substring path li (1+ i))) parts)
                li (1+ i)))
        (setq i (1+ i)))
--- 253,265 ----
        parts)
      (if (and (eshell-under-windows-p)
             (> len 2)
!            (eq (aref path 0) ?/)
!            (eq (aref path 1) ?/))
        (setq i 2))
      (while (< i len)
!       (if (and (eq (aref path i) ?/)
               (not (get-text-property i 'escaped path)))
!         (setq parts (cons (if (= li i) "/"
                              (substring path li (1+ i))) parts)
                li (1+ i)))
        (setq i (1+ i)))
***************
*** 268,276 ****
        (setq parts (cons (substring path li i) parts)))
      (if (and (eshell-under-windows-p)
             (string-match "\\`[A-Za-z]:\\'" (car (last parts))))
!       (setcar (last parts)
!               (concat (car (last parts))
!                       (char-to-string directory-sep-char))))
      (nreverse parts)))
  
  (defun eshell-to-flat-string (value)
--- 267,273 ----
        (setq parts (cons (substring path li i) parts)))
      (if (and (eshell-under-windows-p)
             (string-match "\\`[A-Za-z]:\\'" (car (last parts))))
!       (setcar (last parts) (concat (car (last parts)) "/")))
      (nreverse parts)))
  
  (defun eshell-to-flat-string (value)
***************
*** 450,457 ****
                                 (point) (progn (end-of-line)
                                                (point))) ":")))
            (if (and (and fields (nth 0 fields) (nth 2 fields))
!                    (not (assq (string-to-int (nth 2 fields)) names)))
!               (setq names (cons (cons (string-to-int (nth 2 fields))
                                        (nth 0 fields))
                                  names))))
          (forward-line))))
--- 447,454 ----
                                 (point) (progn (end-of-line)
                                                (point))) ":")))
            (if (and (and fields (nth 0 fields) (nth 2 fields))
!                    (not (assq (string-to-number (nth 2 fields)) names)))
!               (setq names (cons (cons (string-to-number (nth 2 fields))
                                        (nth 0 fields))
                                  names))))
          (forward-line))))