Fix some oddities in Tramp's rsync and smb methods

[gnu-emacs] / lisp / eshell / em-dirs.el

diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 4a3fa54626bccc0d67d937db8865b9d323215cf0..743779ea13b561f5f61db247e01f2a0216d69e28 100644 (file)
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -1,6 +1,6 @@
-;;; em-dirs.el --- directory navigation commands
+;;; em-dirs.el --- directory navigation commands  -*- lexical-binding:t -*-

 
 

-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.

 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 
 ;; Author: John Wiegley <johnw@gnu.org>
 


@@ -71,7 +71,7 @@ they lack somewhat in feel from the typical shell equivalents."
   "The function used to normalize the value of Eshell's `pwd'.
 The value returned by `pwd' is also used when recording the
 last-visited directory in the last-dir-ring, so it will affect the
   "The function used to normalize the value of Eshell's `pwd'.
 The value returned by `pwd' is also used when recording the
 last-visited directory in the last-dir-ring, so it will affect the

-form of the list used by 'cd ='."
+form of the list used by `cd ='."

   :type '(radio (function-item file-truename)
                (function-item expand-file-name)
                (function-item identity)
   :type '(radio (function-item file-truename)
                (function-item expand-file-name)
                (function-item identity)


@@ -115,7 +115,7 @@ calls \"ls\" and references `eshell-last-arguments'."
   :group 'eshell-dirs)
 
 (defcustom eshell-pushd-tohome nil
   :group 'eshell-dirs)
 
 (defcustom eshell-pushd-tohome nil

-  "If non-nil, make pushd with no arg behave as 'pushd ~' (like `cd').
+  "If non-nil, make pushd with no arg behave as `pushd ~' (like `cd').

 This mirrors the optional behavior of tcsh."
   :type 'boolean
   :group 'eshell-dirs)
 This mirrors the optional behavior of tcsh."
   :type 'boolean
   :group 'eshell-dirs)


@@ -150,11 +150,11 @@ If it is nil, the last-dir-ring will not be written to disk."
   "If non-nil, the size of the directory history ring.
 This ring is added to every time `cd' or `pushd' is used.  It simply
 stores the most recent directory locations Eshell has been in.  To
   "If non-nil, the size of the directory history ring.
 This ring is added to every time `cd' or `pushd' is used.  It simply
 stores the most recent directory locations Eshell has been in.  To

-return to the most recent entry, use 'cd -' (equivalent to 'cd -0').
-To return to an older entry, use 'cd -N', where N is an integer less
+return to the most recent entry, use `cd -' (equivalent to `cd -0').
+To return to an older entry, use `cd -N', where N is an integer less

 than `eshell-last-dir-ring-size'.  To return to the last directory
 than `eshell-last-dir-ring-size'.  To return to the last directory

-matching a particular regexp, use 'cd =REGEXP'.  To display the
-directory history list, use 'cd ='.
+matching a particular regexp, use `cd =REGEXP'.  To display the
+directory history list, use `cd ='.

 
 This mechanism is very similar to that provided by `pushd', except
 it's far more automatic.  `pushd' allows the user to decide which
 
 This mechanism is very similar to that provided by `pushd', except
 it's far more automatic.  `pushd' allows the user to decide which


@@ -207,7 +207,8 @@ Thus, this does not include the current directory.")
   (when eshell-cd-on-directory
     (make-local-variable 'eshell-interpreter-alist)
     (setq eshell-interpreter-alist
   (when eshell-cd-on-directory
     (make-local-variable 'eshell-interpreter-alist)
     (setq eshell-interpreter-alist

-         (cons (cons 'eshell-lone-directory-p
+         (cons (cons #'(lambda (file args)
+                          (eshell-lone-directory-p file))

                      'eshell-dirs-substitute-cd)
                eshell-interpreter-alist)))
 
                      'eshell-dirs-substitute-cd)
                eshell-interpreter-alist)))
 


@@ -242,8 +243,9 @@ Thus, this does not include the current directory.")
                   eshell-ask-to-save-last-dir
                   (or (eq eshell-ask-to-save-last-dir 'always)
                       (y-or-n-p
                   eshell-ask-to-save-last-dir
                   (or (eq eshell-ask-to-save-last-dir 'always)
                       (y-or-n-p

-                       (format "Save last dir ring for Eshell buffer `%s'? "
-                               (buffer-name buf)))))
+                       (format-message
+                        "Save last dir ring for Eshell buffer `%s'? "
+                        (buffer-name buf)))))

              (eshell-write-last-dir-ring))))))
 
 (defun eshell-lone-directory-p (file)
              (eshell-write-last-dir-ring))))))
 
 (defun eshell-lone-directory-p (file)


@@ -299,7 +301,7 @@ Thus, this does not include the current directory.")
                 eshell-user-names)))))))
 
 (defun eshell/pwd (&rest args)
                 eshell-user-names)))))))
 
 (defun eshell/pwd (&rest args)

-  "Change output from `pwd` to be cleaner."
+  "Change output from `pwd' to be cleaner."

   (let* ((path default-directory)
         (len (length path)))
     (if (and (> len 1)
   (let* ((path default-directory)
         (len (length path)))
     (if (and (> len 1)


@@ -312,7 +314,7 @@ Thus, this does not include the current directory.")
       path)))
 
 (defun eshell-expand-multiple-dots (path)
       path)))
 
 (defun eshell-expand-multiple-dots (path)

-  "Convert '...' to '../..', '....' to '../../..', etc..
+  "Convert `...' to `../..', `....' to `../../..', etc..

 
 With the following piece of advice, you can make this functionality
 available in most of Emacs, with the exception of filename completion
 
 With the following piece of advice, you can make this functionality
 available in most of Emacs, with the exception of filename completion


@@ -347,8 +349,6 @@ in the minibuffer:
                  index (1+ index)))))
     oldpath))
 
                  index (1+ index)))))
     oldpath))
 

-(defvar dired-directory)
-

 (defun eshell/cd (&rest args)           ; all but first ignored
   "Alias to extend the behavior of `cd'."
   (setq args (eshell-flatten-list args))
 (defun eshell/cd (&rest args)           ; all but first ignored
   "Alias to extend the behavior of `cd'."
   (setq args (eshell-flatten-list args))


@@ -365,7 +365,7 @@ in the minibuffer:
       (let ((curdir (eshell/pwd)))
        (if (string-match path curdir)
            (setq path (replace-match subpath nil nil curdir))
       (let ((curdir (eshell/pwd)))
        (if (string-match path curdir)
            (setq path (replace-match subpath nil nil curdir))

-         (error "Path substring '%s' not found" path))))
+         (error "Path substring `%s' not found" path))))

      ((and path (string-match "^-\\([0-9]*\\)$" path))
       (let ((index (match-string 1 path)))
        (setq path
      ((and path (string-match "^-\\([0-9]*\\)$" path))
       (let ((index (match-string 1 path)))
        (setq path


@@ -393,11 +393,11 @@ in the minibuffer:
      (path
       (setq path (eshell-expand-multiple-dots path))))
     (unless handled
      (path
       (setq path (eshell-expand-multiple-dots path))))
     (unless handled

-      (setq dired-directory (or path "~"))
-      (let ((curdir (eshell/pwd)))
-       (unless (equal curdir dired-directory)
+      (let ((curdir (eshell/pwd))
+           (newdir (or path "~")))
+       (unless (equal curdir newdir)

          (eshell-add-to-dir-ring curdir))
          (eshell-add-to-dir-ring curdir))

-       (let ((result (cd dired-directory)))
+       (let ((result (cd newdir)))

          (and eshell-cd-shows-directory
               (eshell-printn result)))
        (run-hooks 'eshell-directory-change-hook)
          (and eshell-cd-shows-directory
               (eshell-printn result)))
        (run-hooks 'eshell-directory-change-hook)