Mercurial > emacs
changeset 21836:1173cfe8b7bd
(ange-ftp-real-expand-file-name-actual):
Locally bind old-name, new-name, final, drive-letter.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 29 Apr 1998 05:24:09 +0000 |
| parents | f1df0fd84e42 |
| children | ea78758c282e |
| files | lisp/ange-ftp.el |
| diffstat | 1 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ange-ftp.el Wed Apr 29 05:22:19 1998 +0000 +++ b/lisp/ange-ftp.el Wed Apr 29 05:24:09 1998 +0000 @@ -5676,17 +5676,18 @@ ;; If a drive letter has been added, remote it. Otherwise, if the drive ;; letter existed before, leave it. (defun ange-ftp-real-expand-file-name-actual (&rest args) - (setq old-name (car args)) - (setq new-name (ange-ftp-run-real-handler 'expand-file-name args)) - (setq drive-letter (substring new-name 0 2)) - ;; I'd like to distill the following lines into one (if) statement - ;; removing the need for the temp final variable - (setq final new-name) - (if (not (equal (substring old-name 0 1) "~")) - (if (or (< (length old-name) 2) - (not (string-match "/[a-zA-Z]:" old-name))) - (setq final (substring new-name 2)))) - final) + (let (old-name new-name final drive-letter) + (setq old-name (car args)) + (setq new-name (ange-ftp-run-real-handler 'expand-file-name args)) + (setq drive-letter (substring new-name 0 2)) + ;; I'd like to distill the following lines into one (if) statement + ;; removing the need for the temp final variable + (setq final new-name) + (if (not (equal (substring old-name 0 1) "~")) + (if (or (< (length old-name) 2) + (not (string-match "/[a-zA-Z]:" old-name))) + (setq final (substring new-name 2)))) + final)) ;;;; ------------------------------------------------------------