From: Lars Ingebrigtsen Date: Mon, 22 Feb 2021 14:47:30 +0000 (+0100) Subject: Simplify comint-watch-for-password-prompt X-Git-Tag: emacs-28.0.90~3606 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c170c64b178da1df05d953d993e992b8bdc2502;p=emacs.git Simplify comint-watch-for-password-prompt * lisp/comint.el (comint-watch-for-password-prompt): Simplify by using `string-trim'. --- diff --git a/lisp/comint.el b/lisp/comint.el index ea69c3b1f11..5c307febe2a 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -104,6 +104,7 @@ (require 'ring) (require 'ansi-color) (require 'regexp-opt) ;For regexp-opt-charset. +(eval-when-compile (require 'subr-x)) ;; Buffer Local Variables: ;;============================================================================ @@ -2430,14 +2431,11 @@ This function could be in the list `comint-output-filter-functions'." (when (let ((case-fold-search t)) (string-match comint-password-prompt-regexp (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))) (if (> comint--prompt-recursion-depth 10) (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