[Emacs-diffs] /srv/bzr/emacs/trunk r105167: * simple.el (blink-matching-open): Make error message from last change less verbose.

[Chong Yidong]

------------------------------------------------------------
revno: 105167
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 12:15:07 -0400
message:
  * simple.el (blink-matching-open): Make error message from last change less 
verbose.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-13 15:33:08 +0000
+++ b/lisp/ChangeLog    2011-07-13 16:15:07 +0000
@@ -1,3 +1,8 @@
+2011-07-13  Chong Yidong  <address@hidden>
+
+       * simple.el (blink-matching-open): Make the error message from the
+       last change less verbose.
+
 2011-07-13  Dan Nicolaescu  <address@hidden>
 
        * font-lock.el (font-lock-comment-face): Use the high contrast

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-07-13 14:57:28 +0000
+++ b/lisp/simple.el    2011-07-13 16:15:07 +0000
@@ -5487,19 +5487,15 @@
   (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 @@
        (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