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

[John Wiegley]

Index: emacs/lisp/eshell/em-dirs.el
diff -c emacs/lisp/eshell/em-dirs.el:1.14 emacs/lisp/eshell/em-dirs.el:1.15
*** emacs/lisp/eshell/em-dirs.el:1.14   Tue Apr 27 13:54:39 2004
--- emacs/lisp/eshell/em-dirs.el        Tue May 31 00:14:26 2005
***************
*** 276,283 ****
      (let* ((letter (match-string 1))
           (regexp (concat "\\`" letter))
           (path (eshell-find-previous-directory regexp)))
!       (concat (or path letter)
!             (char-to-string directory-sep-char)))))
  
  (defun eshell-complete-user-reference ()
    "If there is a user reference, complete it."
--- 276,282 ----
      (let* ((letter (match-string 1))
           (regexp (concat "\\`" letter))
           (path (eshell-find-previous-directory regexp)))
!       (concat (or path letter) "/"))))
  
  (defun eshell-complete-user-reference ()
    "If there is a user reference, complete it."
***************
*** 300,306 ****
    (let* ((path default-directory)
         (len (length path)))
      (if (and (> len 1)
!            (eq (aref path (1- len)) directory-sep-char)
             (not (and (eshell-under-windows-p)
                       (string-match "\\`[A-Za-z]:[\\\\/]\\'" path))))
        (setq path (substring path 0 (1- (length path)))))
--- 299,305 ----
    (let* ((path default-directory)
         (len (length path)))
      (if (and (> len 1)
!            (eq (aref path (1- len)) ?/)
             (not (and (eshell-under-windows-p)
                       (string-match "\\`[A-Za-z]:[\\\\/]\\'" path))))
        (setq path (substring path 0 (1- (length path)))))
***************
*** 324,332 ****
           (len (length extra-dots))
           replace-text)
        (while (> len 0)
!       (setq replace-text
!             (concat replace-text
!                     (char-to-string directory-sep-char) "..")
              len (1- len)))
        (setq path
            (replace-match replace-text t t path 1))))
--- 323,329 ----
           (len (length extra-dots))
           replace-text)
        (while (> len 0)
!       (setq replace-text (concat replace-text "/..")
              len (1- len)))
        (setq path
            (replace-match replace-text t t path 1))))
***************
*** 371,377 ****
        (setq path
              (ring-remove eshell-last-dir-ring
                           (if index
!                              (string-to-int index)
                             0)))))
       ((and path (string-match "^=\\(.*\\)$" path))
        (let ((oldpath (eshell-find-previous-directory
--- 368,374 ----
        (setq path
              (ring-remove eshell-last-dir-ring
                           (if index
!                              (string-to-number index)
                             0)))))
       ((and path (string-match "^=\\(.*\\)$" path))
        (let ((oldpath (eshell-find-previous-directory