diff lisp/simple.el @ 83404:69e184bbba16

Merged from [e-mail]--gnu-2005 (patch 656-658) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-656 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-657 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-658 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-444

--- a/lisp/simple.el	Sat Nov 19 19:17:56 2005 +0000
+++ b/lisp/simple.el	Wed Nov 23 01:35:21 2005 +0000
@@ -893,9 +893,9 @@
 	 (col (current-column)))
     (if (= pos end)
 	(if (or (/= beg 1) (/= end (1+ total)))
-	    (message "point=%d of %d (%d%%) <%d - %d> column %d %s"
+	    (message "point=%d of %d (%d%%) <%d-%d> column=%d%s"
 		     pos total percent beg end col hscroll)
-	  (message "point=%d of %d (EOB) column %d %s"
+	  (message "point=%d of %d (EOB) column=%d%s"
 		   pos total col hscroll))
       (let ((coding buffer-file-coding-system)
 	    encoded encoding-msg display-prop under-display)
@@ -904,7 +904,7 @@
 	    (setq coding default-buffer-file-coding-system))
 	(if (not (char-valid-p char))
 	    (setq encoding-msg
-		  (format "(0%o, %d, 0x%x, invalid)" char char char))
+		  (format "(%d, #o%o, #x%x, invalid)" char char char))
 	  ;; Check if the character is displayed with some `display'
 	  ;; text property.  In that case, set under-display to the
 	  ;; buffer substring covered by that property.
@@ -923,27 +923,27 @@
 	  (setq encoding-msg
 		(if display-prop
 		    (if (not (stringp display-prop))
-			(format "(0%o, %d, 0x%x, part of display \"%s\")"
+			(format "(%d, #o%o, #x%x, part of display \"%s\")"
 				char char char under-display)
-		      (format "(0%o, %d, 0x%x, part of display \"%s\"->\"%s\")"
+		      (format "(%d, #o%o, #x%x, part of display \"%s\"->\"%s\")"
 			      char char char under-display display-prop))
 		  (if encoded
-		      (format "(0%o, %d, 0x%x, file %s)"
+		      (format "(%d, #o%o, #x%x, file %s)"
 			      char char char
 			      (if (> (length encoded) 1)
 				  "..."
 				(encoded-string-description encoded coding)))
-		    (format "(0%o, %d, 0x%x)" char char char)))))
+		    (format "(%d, #o%o, #x%x)" char char char)))))
 	(if detail
 	    ;; We show the detailed information about CHAR.
 	    (describe-char (point)))
 	(if (or (/= beg 1) (/= end (1+ total)))
-	    (message "Char: %s %s point=%d of %d (%d%%) <%d - %d> column %d %s"
+	    (message "Char: %s %s point=%d of %d (%d%%) <%d-%d> column=%d%s"
 		     (if (< char 256)
 			 (single-key-description char)
 		       (buffer-substring-no-properties (point) (1+ (point))))
 		     encoding-msg pos total percent beg end col hscroll)
-	  (message "Char: %s %s point=%d of %d (%d%%) column %d %s"
+	  (message "Char: %s %s point=%d of %d (%d%%) column=%d%s"
 		   (if enable-multibyte-characters
 		       (if (< char 128)
 			   (single-key-description char)
@@ -4320,7 +4320,11 @@
 			  (eq (syntax-class syntax) 4)
 			  (cdr syntax)))))
 	(cond
-	 ((not (eq matching-paren (char-before oldpos)))
+	 ((not (or (eq matching-paren (char-before oldpos))
+                   ;; The cdr might hold a new paren-class info rather than
+                   ;; a matching-char info, in which case the two CDRs
+                   ;; should match.
+                   (eq matching-paren (cdr (syntax-after oldpos)))))
 	  (message "Mismatched parentheses"))
 	 ((not blinkpos)
 	  (if (not blink-matching-paren-distance)