diff options
| author | Stefan Monnier | 2005-10-02 15:38:20 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-10-02 15:38:20 +0000 |
| commit | 402893bb42d63da7d63b0ada348d7797baf96201 (patch) | |
| tree | ed43f17b082b4488e92a1c8e0bdc4549b24026de | |
| parent | ba6be78d4e194533eaa0d41ad009d278bdc320ec (diff) | |
| download | emacs-402893bb42d63da7d63b0ada348d7797baf96201.tar.gz emacs-402893bb42d63da7d63b0ada348d7797baf96201.zip | |
(ange-ftp-insert-directory): Undo unintended part in last change.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d02505c3965..63b44276b16 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-10-02 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-insert-directory): Undo unintended part | ||
| 4 | in last change. | ||
| 5 | |||
| 1 | 2005-10-02 Romain Francoise <romain@orebokech.com> | 6 | 2005-10-02 Romain Francoise <romain@orebokech.com> |
| 2 | 7 | ||
| 3 | * progmodes/compile.el (compile-goto-error): Delete extra paren. | 8 | * progmodes/compile.el (compile-goto-error): Delete extra paren. |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 9d2bf43c930..8142e812b74 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -4484,7 +4484,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") | |||
| 4484 | ;; Follow symlinks. | 4484 | ;; Follow symlinks. |
| 4485 | (let (tem) | 4485 | (let (tem) |
| 4486 | (while (and (not wildcard) | 4486 | (while (and (not wildcard) |
| 4487 | (stringp (setq tem (ange-ftp-get-file-entry | 4487 | (stringp (setq tem (file-symlink-p |
| 4488 | (directory-file-name file))))) | 4488 | (directory-file-name file))))) |
| 4489 | (setq file | 4489 | (setq file |
| 4490 | (ange-ftp-expand-symlink | 4490 | (ange-ftp-expand-symlink |