diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/comint.el | 4 | ||||
| -rw-r--r-- | lisp/image-mode.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index 57df6bfb19f..ea69c3b1f11 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -378,7 +378,7 @@ This variable is buffer-local." "\\(?:" (regexp-opt password-word-equivalents) "\\|Response\\)" "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?" ;; "[[:alpha:]]" used to be "for", which fails to match non-English. - "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:blank:]]*\\'") + "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:space:]]*\\'") "Regexp matching prompts for passwords in the inferior process. This is used by `comint-watch-for-password-prompt'." :version "27.1" @@ -2432,6 +2432,8 @@ This function could be in the list `comint-output-filter-functions'." (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") diff --git a/lisp/image-mode.el b/lisp/image-mode.el index ec0a559c8db..7384abf3b23 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -858,7 +858,9 @@ was inserted." (setq image-transform-rotation (or (exif-orientation (ignore-error exif-error - (exif-parse-buffer))) + ;; exif-parse-buffer can move point, so preserve it. + (save-excursion + (exif-parse-buffer)))) 0.0))) ;; Swap width and height when changing orientation ;; between portrait and landscape. |