[Emacs-diffs] /srv/bzr/emacs/trunk r105163: Say that we were unable to find the match within the limit

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105163
fixes bug(s): http://debbugs.gnu.org/5122
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 16:57:28 +0200
message:
  Say that we were unable to find the match within the limit
  
  * simple.el (blink-matching-open): Say that we were unable to find
  the match within the limit, if we're limited (bug#5122).
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-13 14:34:10 +0000
+++ b/lisp/ChangeLog    2011-07-13 14:57:28 +0000
@@ -1,5 +1,8 @@
 2011-07-13  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * simple.el (blink-matching-open): Say that we were unable to find
+       the match within the limit, if we're limited (bug#5122).
+
        * international/mule-cmds.el (prefer-coding-system): Add an
        example (bug#4869).
 

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-07-06 19:44:09 +0000
+++ b/lisp/simple.el    2011-07-13 14:57:28 +0000
@@ -5487,15 +5487,19 @@
   (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
-                (if blink-matching-paren-distance
-                    (narrow-to-region
-                     (max (minibuffer-prompt-end) ;(point-min) unless minibuf.
-                          (- (point) blink-matching-paren-distance))
-                     oldpos))
+                (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)))
                 (let ((parse-sexp-ignore-comments
                        (and parse-sexp-ignore-comments
                             (not blink-matching-paren-dont-ignore-comments))))
@@ -5517,11 +5521,11 @@
        (mismatch
         (if blinkpos
             (if (minibufferp)
-                (minibuffer-message "Mismatched parentheses")
-              (message "Mismatched parentheses"))
+                (minibuffer-message "Mismatched parentheses%s" limit-message)
+              (message "Mismatched parentheses%s" limit-message))
           (if (minibufferp)
-              (minibuffer-message "Unmatched parenthesis")
-            (message "Unmatched parenthesis"))))
+              (minibuffer-message "Unmatched parenthesis%s" limit-message)
+            (message "Unmatched parenthesis%s" limit-message))))
        ((not blinkpos) nil)
        ((pos-visible-in-window-p blinkpos)
         ;; Matching open within window, temporarily move to blinkpos but only