Commit 5fc4038e authored by Chong Yidong's avatar Chong Yidong
Browse files

* simple.el (blink-matching-open): Make error message from last change less verbose.

parent bf6012e5
2011-07-13 Chong Yidong <cyd@stupidchicken.com>
* simple.el (blink-matching-open): Make the error message from the
last change less verbose.
2011-07-13 Dan Nicolaescu <dann@ics.uci.edu>
* font-lock.el (font-lock-comment-face): Use the high contrast
......
......@@ -5487,19 +5487,15 @@ The function should return non-nil if the two tokens do not match.")
(when (and (not (bobp))
blink-matching-paren)
(let* ((oldpos (point))
(limit-message "")
(message-log-max nil) ; Don't log messages about paren matching.
(blinkpos
(save-excursion
(save-restriction
(when blink-matching-paren-distance
(let ((start (- (point) blink-matching-paren-distance)))
(when (> start (minibuffer-prompt-end))
(setq limit-message " within the limit"))
(narrow-to-region
(max (minibuffer-prompt-end) ;(point-min) unless minibuf.
start)
oldpos)))
(if blink-matching-paren-distance
(narrow-to-region
(max (minibuffer-prompt-end) ;(point-min) unless minibuf.
(- (point) blink-matching-paren-distance))
oldpos))
(let ((parse-sexp-ignore-comments
(and parse-sexp-ignore-comments
(not blink-matching-paren-dont-ignore-comments))))
......@@ -5521,11 +5517,11 @@ The function should return non-nil if the two tokens do not match.")
(mismatch
(if blinkpos
(if (minibufferp)
(minibuffer-message "Mismatched parentheses%s" limit-message)
(message "Mismatched parentheses%s" limit-message))
(minibuffer-message "Mismatched parentheses")
(message "Mismatched parentheses"))
(if (minibufferp)
(minibuffer-message "Unmatched parenthesis%s" limit-message)
(message "Unmatched parenthesis%s" limit-message))))
(minibuffer-message "No matching parenthesis found")
(message "No matching parenthesis found"))))
((not blinkpos) nil)
((pos-visible-in-window-p blinkpos)
;; Matching open within window, temporarily move to blinkpos but only
......
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