mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

* net/ange-ftp.el (ange-ftp-get-passwd): Throw if `non-essential'

Browse Source 
is non-nil.
(ange-ftp-ignore-errors-if-non-essential): New defmacro.
(ange-ftp-file-name-all-completions): Use it.  (Bug#11808)
This commit is contained in:
Michael Albinus 2012-06-29 09:14:36 +02:00
parent c8d3a25c09
commit 929df0e722
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-29 Michael Albinus <michael.albinus@gmx.de>
* net/ange-ftp.el (ange-ftp-get-passwd): Throw if `non-essential'
is non-nil.
(ange-ftp-ignore-errors-if-non-essential): New defmacro.
(ange-ftp-file-name-all-completions): Use it. (Bug#11808)
2012-06-29 Andreas Schwab <schwab@linux-m68k.org>
* calendar/cal-dst.el (calendar-current-time-zone):

12
lisp/net/ange-ftp.el
View File

@ -1200,6 +1200,11 @@ only return the directory part of FILE."
(defun ange-ftp-get-passwd (host user)
"Return the password for specified HOST and USER, asking user if necessary."
;; If `non-essential' is non-nil, don't ask for a password. It will
;; be catched in Tramp.
(when non-essential
(throw 'non-essential 'non-essential))
(ange-ftp-parse-netrc)
;; look up password in the hash table first; user might have overridden the
@ -3969,10 +3974,15 @@ E.g.,
(string-match "\\`[a-zA-Z]:[/\\]\\'" dir))
(string-equal "/" dir)))
(defmacro ange-ftp-ignore-errors-if-non-essential (&rest body)
`(if non-essential
(ignore-errors ,@body)
(progn ,@body)))
(defun ange-ftp-file-name-all-completions (file dir)
(let ((ange-ftp-this-dir (expand-file-name dir)))
(if (ange-ftp-ftp-name ange-ftp-this-dir)
(progn
(ange-ftp-ignore-errors-if-non-essential
(ange-ftp-barf-if-not-directory ange-ftp-this-dir)
(setq ange-ftp-this-dir
(ange-ftp-real-file-name-as-directory ange-ftp-this-dir))