[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116058: Fix Bug#13124.
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r116058: Fix Bug#13124. |
Date: |
Fri, 17 Jan 2014 18:20:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116058
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2014-01-17 19:20:39 +0100
message:
Fix Bug#13124.
* net/tramp.el (tramp-password-prompt-regexp): Use
`password-word-equivalents' if available.
(tramp-action-password, tramp-process-one-action)
(tramp-read-passwd): Let-bind `case-fold-search' to t.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/tramp.el tramp.el-20091113204419-o5vbwnq5f7feedwu-2427
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-17 16:45:45 +0000
+++ b/lisp/ChangeLog 2014-01-17 18:20:39 +0000
@@ -1,3 +1,10 @@
+2014-01-17 Michael Albinus <address@hidden>
+
+ * net/tramp.el (tramp-password-prompt-regexp): Use
+ `password-word-equivalents' if available.
+ (tramp-action-password, tramp-process-one-action)
+ (tramp-read-passwd): Let-bind `case-fold-search' to t. (Bug#13124)
+
2014-01-17 Chong Yidong <address@hidden>
* simple.el (password-word-equivalents): New defcustom.
=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-01-01 07:43:34 +0000
+++ b/lisp/net/tramp.el 2014-01-17 18:20:39 +0000
@@ -566,7 +566,10 @@
:type 'regexp)
(defcustom tramp-password-prompt-regexp
- "^.*\\([pP]assword\\|[pP]assphrase\\).*:address@hidden *"
+ (format "^.*\\(%s\\).*:address@hidden *"
+ (if (boundp 'password-word-equivalents)
+ (regexp-opt (symbol-value 'password-word-equivalents))
+ "password\\|passphrase"))
"Regexp matching password-like prompts.
The regexp should match at end of buffer.
@@ -3352,7 +3355,8 @@
(defun tramp-action-password (proc vec)
"Query the user for a password."
(with-current-buffer (process-buffer proc)
- (let ((enable-recursive-minibuffers t))
+ (let ((enable-recursive-minibuffers t)
+ (case-fold-search t))
(tramp-check-for-regexp proc tramp-password-prompt-regexp)
(tramp-message vec 3 "Sending %s" (match-string 1))
;; We don't call `tramp-send-string' in order to hide the
@@ -3438,7 +3442,8 @@
(defun tramp-process-one-action (proc vec actions)
"Wait for output from the shell and perform one action."
- (let (found todo item pattern action)
+ (let ((case-fold-search t)
+ found todo item pattern action)
(while (not found)
;; Reread output once all actions have been performed.
;; Obviously, the output was not complete.
@@ -4039,7 +4044,8 @@
"Read a password from user (compat function).
Consults the auth-source package.
Invokes `password-read' if available, `read-passwd' else."
- (let* ((key (tramp-make-tramp-file-name
+ (let* ((case-fold-search t)
+ (key (tramp-make-tramp-file-name
tramp-current-method tramp-current-user
tramp-current-host ""))
(pw-prompt
@@ -4259,11 +4265,6 @@
;; tramp-server-local-variable-alist) to define any such variables
;; that they need to, which would then be let bound as appropriate
;; in tramp functions. (Jason Rumney)
-;; * IMHO, it's a drawback that currently Tramp doesn't support
-;; Unicode in Dired file names by default. Is it possible to
-;; improve Tramp to set LC_ALL to "C" only for commands where Tramp
-;; expects English? Or just to set LC_MESSAGES to "C" if Tramp
-;; expects only English messages? (Juri Linkov)
;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846)
;; * I was wondering if it would be possible to use tramp even if I'm
;; actually using sshfs. But when I launch a command I would like
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116058: Fix Bug#13124.,
Michael Albinus <=