Prevent confusion with the indentically/similarly named functions, and make obvious which code the following commits touch.
Signed-off-by: Pieter Praet <[email protected]> --- magit.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/magit.el b/magit.el index 5cd4fd4..95ad5c8 100644 --- a/magit.el +++ b/magit.el @@ -332,13 +332,13 @@ (defcustom magit-process-connection-type (not (eq system-type 'cygwin)) :type '(choice (const :tag "pipe" nil) (const :tag "pty" t))) -(defcustom magit-process-yes-or-no-prompt +(defcustom magit-process-yes-or-no-prompt-regexp " [\[(]\\([Yy]\\(?:es\\)?\\)[/|]\\([Nn]o?\\)[\])]\\? ?$" "Regexp matching Yes-or-No prompts of git and its subprocesses." :group 'magit :type 'regexp) -(defcustom magit-process-password-prompts +(defcustom magit-process-password-prompt-regexps '("^\\(Enter \\)?[Pp]assphrase\\( for key '.*'\\)?: ?$" "^\\(Enter \\)?[Pp]assword\\( for '.*'\\)?: ?$" "^.*'s password: ?$" @@ -347,7 +347,7 @@ (defcustom magit-process-password-prompts :group 'magit :type '(repeat (regexp))) -(defcustom magit-process-username-prompts +(defcustom magit-process-username-prompt-regexps '("^Username for '.*': ?$") "List of regexps matching username prompts of git and its subprocesses." :group 'magit @@ -2524,7 +2524,7 @@ (defun magit-process-filter (proc string) (set-marker (process-mark proc) (point))))) (defun magit-process-yes-or-no-prompt (proc string) - (let ((beg (string-match magit-process-yes-or-no-prompt string))) + (let ((beg (string-match magit-process-yes-or-no-prompt-regexp string))) (when beg (process-send-string proc @@ -2541,14 +2541,14 @@ (defun magit-process-yes-or-no-prompt (proc string) (defun magit-process-password-prompt (proc string) "Forward password prompts to the user." (let ((prompt (magit-process-match-prompt - magit-process-password-prompts string))) + magit-process-password-prompt-regexps string))) (when prompt (process-send-string proc (concat (read-passwd prompt) "\n"))))) (defun magit-process-username-prompt (proc string) "Forward username prompts to the user." (let ((prompt (magit-process-match-prompt - magit-process-username-prompts string))) + magit-process-username-prompt-regexps string))) (when prompt (process-send-string proc (concat (read-string prompt nil nil -- 1.7.11.1 -- --- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
