[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2ae53db: * lisp/comint.el (comint-strip-ctrl-m): Avoid `called-in
From: |
Stefan Monnier |
Subject: |
master 2ae53db: * lisp/comint.el (comint-strip-ctrl-m): Avoid `called-interactively-p` |
Date: |
Mon, 12 Apr 2021 11:53:29 -0400 (EDT) |
branch: master
commit 2ae53db722b64eb5e67ef53de46825b766fba17e
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/comint.el (comint-strip-ctrl-m): Avoid `called-interactively-p`
---
lisp/comint.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/comint.el b/lisp/comint.el
index 9cbcfc0..2745c5a 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2254,23 +2254,23 @@ This function could be on
`comint-output-filter-functions' or bound to a key."
(let ((inhibit-read-only t))
(delete-region (point-min) (point)))))
-(defun comint-strip-ctrl-m (&optional _string)
+(defun comint-strip-ctrl-m (&optional _string interactive)
"Strip trailing `^M' characters from the current output group.
This function could be on `comint-output-filter-functions' or bound to a key."
- (interactive)
+ (interactive (list nil t))
(let ((process (get-buffer-process (current-buffer))))
(if (not process)
;; This function may be used in
;; `comint-output-filter-functions', and in that case, if
;; there's no process, then we should do nothing. If
;; interactive, report an error.
- (when (called-interactively-p 'interactive)
+ (when interactive
(error "No process in the current buffer"))
(let ((pmark (process-mark process)))
(save-excursion
(condition-case nil
(goto-char
- (if (called-interactively-p 'interactive)
+ (if interactive
comint-last-input-end comint-last-output-start))
(error nil))
(while (re-search-forward "\r+$" pmark t)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 2ae53db: * lisp/comint.el (comint-strip-ctrl-m): Avoid `called-interactively-p`,
Stefan Monnier <=