Commit 0c170c64 authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

Simplify comint-watch-for-password-prompt

* lisp/comint.el (comint-watch-for-password-prompt): Simplify by
using `string-trim'.
parent c1712f55
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
(require 'ring) (require 'ring)
(require 'ansi-color) (require 'ansi-color)
(require 'regexp-opt) ;For regexp-opt-charset. (require 'regexp-opt) ;For regexp-opt-charset.
(eval-when-compile (require 'subr-x))
;; Buffer Local Variables: ;; Buffer Local Variables:
;;============================================================================ ;;============================================================================
...@@ -2430,14 +2431,11 @@ This function could be in the list `comint-output-filter-functions'." ...@@ -2430,14 +2431,11 @@ This function could be in the list `comint-output-filter-functions'."
(when (let ((case-fold-search t)) (when (let ((case-fold-search t))
(string-match comint-password-prompt-regexp (string-match comint-password-prompt-regexp
(replace-regexp-in-string "\r" "" string))) (replace-regexp-in-string "\r" "" string)))
(when (string-match "^[ \n\r\t\v\f\b\a]+" string)
(setq string (replace-match "" t t string)))
(when (string-match "\n+\\'" string)
(setq string (replace-match "" t t string)))
(let ((comint--prompt-recursion-depth (1+ comint--prompt-recursion-depth))) (let ((comint--prompt-recursion-depth (1+ comint--prompt-recursion-depth)))
(if (> comint--prompt-recursion-depth 10) (if (> comint--prompt-recursion-depth 10)
(message "Password prompt recursion too deep") (message "Password prompt recursion too deep")
(comint-send-invisible string))))) (comint-send-invisible
(string-trim string "[ \n\r\t\v\f\b\a]+" "\n+"))))))
;; Low-level process communication ;; Low-level process communication
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment