From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 1 Jun 2008 04:48:53 +0000 (+0000)
Subject: (describe-text-sexp): Use `string-match-p'.  Simplify.
X-Git-Tag: emacs-pretest-23.0.90~5176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70583cb56977d91d94bff77cb2fb93922c44876c;p=emacs.git

(describe-text-sexp): Use `string-match-p'.  Simplify.
(describe-char): Use `looking-at-p', `string-match-p' when possible.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2eadd9aa6e3..05ff2258377 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-01  Juanma Barranquero  <lekktu@gmail.com>
+
+	* descr-text.el (describe-text-sexp): Use `string-match-p'.  Simplify.
+	(describe-char): Use `looking-at-p', `string-match-p' when possible.
+
 2008-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* tar-mode.el (tar-header-block-summarize): Ensure one space around
@@ -5,8 +10,8 @@
 
 2008-05-31  John Paul Wallington  <jpw@pobox.com>
 
-	* help-fns.el (describe-variable-custom-version-info): Handle
-	dotted `package-version' info.
+	* help-fns.el (describe-variable-custom-version-info):
+	Handle dotted `package-version' info.
 
 2008-05-31  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index d493188a978..9c1d2538ec3 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -49,19 +49,17 @@
   (let ((pp (condition-case signal
 		(pp-to-string sexp)
 	      (error (prin1-to-string signal)))))
-    (when (string-match "\n\\'" pp)
+    (when (string-match-p "\n\\'" pp)
       (setq pp (substring pp 0 (1- (length pp)))))
-    (if (cond ((string-match "\n" pp)
-	       nil)
-	      ((> (length pp) (- (window-width) (current-column)))
-	       nil)
-	      (t t))
+
+    (if (and (not (string-match-p "\n" pp))
+    	     (<= (length pp) (- (window-width) (current-column))))
 	(insert pp)
       (insert-text-button
        "[Show]" 'action `(lambda (&rest ignore)
-			(with-output-to-temp-buffer
-			    "*Pp Eval Output*"
-			  (princ ',pp)))
+			   (with-output-to-temp-buffer
+			       "*Pp Eval Output*"
+			     (princ ',pp)))
        'help-echo "mouse-2, RET: pretty print value in another buffer"))))
 
 (defun describe-property-list (properties)
@@ -493,7 +491,7 @@ as well as widgets, buttons, overlays, and text properties."
 			 (cond
 			  ((and show-trailing-whitespace
 				(save-excursion (goto-char pos)
-						(looking-at "[ \t]+$")))
+						(looking-at-p "[ \t]+$")))
 			   'trailing-whitespace)
 			  ((and nobreak-char-display char (eq char '#xa0))
 			   'nobreak-space)
@@ -523,7 +521,7 @@ as well as widgets, buttons, overlays, and text properties."
 		(if (eq (car-safe clm) 'insert-text-button)
 		    (progn (insert " ") (eval clm))
 		  (when (>= (+ (current-column)
-			       (or (string-match "\n" clm)
+			       (or (string-match-p "\n" clm)
 				   (string-width clm))
 			       1)
 			    (window-width))