From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 13 Jul 2011 16:15:07 +0000 (-0400)
Subject: * simple.el (blink-matching-open): Make error message from last change less verbose.
X-Git-Tag: emacs-pretest-24.0.90~104^2~316
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fc4038e207dc31e10a6d58d9294617fcda054bf;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bc706f8a61..3dccc44375a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/lisp/simple.el b/lisp/simple.el
index 383f66a5a13..0f301dae505 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -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