summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-12-21 18:08:12 +0000
committerKarl Heuer <kwzh@gnu.org>1995-12-21 18:08:12 +0000
commit2496a43cd96ec9a60199a4e42985122ad30f58e9 (patch)
tree3d7700101f3724dd20a945081c8df20e29997bb6
parentc14cfa2570b8314a67a2a82a4a90a0b3ef1fbb2b (diff)
downloademacs-2496a43cd96ec9a60199a4e42985122ad30f58e9.tar.gz
(blink-matching-paren-on-screen): New variable.
(blink-matching-open): Obey it. (shell-command-on-region): If current buffer is *Shell Command Output*, use the replacement case.
-rw-r--r--lisp/simple.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index fa442280255..e58213e27fc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -865,7 +865,8 @@ In either case, the output is inserted after point (leaving mark after it)."
current-prefix-arg)))
(if (or replace
(and output-buffer
- (not (or (bufferp output-buffer) (stringp output-buffer)))))
+ (not (or (bufferp output-buffer) (stringp output-buffer))))
+ (equal (buffer-name (current-buffer)) "*Shell Command Output*"))
;; Replace specified region with output from command.
(let ((swap (and replace (< start end))))
;; Don't muck with mark unless REPLACE says we should.
@@ -2610,6 +2611,11 @@ in the mode line."
(defvar blink-matching-paren t
"*Non-nil means show matching open-paren when close-paren is inserted.")
+(defvar blink-matching-paren-on-screen t
+ "*Non-nil means show matching open-paren when it is on screen.
+nil means don't show it (but the open-paren can still be shown
+when it is off screen.")
+
(defconst blink-matching-paren-distance 12000
"*If non-nil, is maximum distance to search for matching open-paren.")
@@ -2657,7 +2663,8 @@ in the mode line."
(progn
(goto-char blinkpos)
(if (pos-visible-in-window-p)
- (sit-for blink-matching-delay)
+ (and blink-matching-paren-on-screen
+ (sit-for blink-matching-delay))
(goto-char blinkpos)
(message
"Matches %s"