diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4412b54ee4..164a401026c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-10-04 Thien-Thi Nguyen <ttn@gnu.org> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-ls): Fix typo introduced in last change. | ||
| 4 | |||
| 1 | 2005-10-03 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2005-10-03 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * progmodes/cc-styles.el (c-setup-paragraph-variables): Make sure we do | 7 | * progmodes/cc-styles.el (c-setup-paragraph-variables): Make sure we do |
| @@ -142,7 +146,7 @@ | |||
| 142 | dframe-activity-change-focus-flag. | 146 | dframe-activity-change-focus-flag. |
| 143 | (speedbar-update-speed, speedbar-navigating-speed): Obsolete. Use | 147 | (speedbar-update-speed, speedbar-navigating-speed): Obsolete. Use |
| 144 | dframe-update-speed. | 148 | dframe-update-speed. |
| 145 | 149 | ||
| 146 | (speedbar-current-frame): New macro. Use this instead of the | 150 | (speedbar-current-frame): New macro. Use this instead of the |
| 147 | variable speedbar-frame. | 151 | variable speedbar-frame. |
| 148 | 152 | ||
| @@ -153,7 +157,7 @@ | |||
| 153 | defezimage in ezimage.el. | 157 | defezimage in ezimage.el. |
| 154 | (speedbar-expand-image-button-alist): Removed. Replaced by | 158 | (speedbar-expand-image-button-alist): Removed. Replaced by |
| 155 | ezimage-expand-image-button-alist in ezimage.el. | 159 | ezimage-expand-image-button-alist in ezimage.el. |
| 156 | 160 | ||
| 157 | (speedbar-ignored-directory-regexp) | 161 | (speedbar-ignored-directory-regexp) |
| 158 | (speedbar-add-ignored-directory-regexp) | 162 | (speedbar-add-ignored-directory-regexp) |
| 159 | (speedbar-ignored-directory-expressions) | 163 | (speedbar-ignored-directory-expressions) |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 9061dcac38f..bf3b1427ac2 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -2610,7 +2610,7 @@ away in the internal cache." | |||
| 2610 | (ange-ftp-abbreviate-filename | 2610 | (ange-ftp-abbreviate-filename |
| 2611 | ange-ftp-this-file))))) | 2611 | ange-ftp-this-file))))) |
| 2612 | (with-current-buffer (get-buffer-create | 2612 | (with-current-buffer (get-buffer-create |
| 2613 | ange-ftp-data-buffer-name)) | 2613 | ange-ftp-data-buffer-name) |
| 2614 | (erase-buffer) | 2614 | (erase-buffer) |
| 2615 | (if (ange-ftp-real-file-readable-p temp) | 2615 | (if (ange-ftp-real-file-readable-p temp) |
| 2616 | (ange-ftp-real-insert-file-contents temp) | 2616 | (ange-ftp-real-insert-file-contents temp) |