From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 3 Oct 2010 19:54:31 +0000 (-0400)
Subject: Avoid using plusp; cl may not be loaded.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d99a45914df3fe2d133e18c62615ad6a5a8ae278;p=emacs.git

Avoid using plusp; cl may not be loaded.

* lisp/gnus/shr.el (shr-insert):
* lisp/gnus/pop3.el (pop3-movemail):
* lisp/gnus/gnus-html.el (gnus-html-wash-tags): Don't use plusp.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 446d3877d31..54519bc2054 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-03  Chong Yidong  <cyd@stupidchicken.com>
+
+	* shr.el (shr-insert):
+	* pop3.el (pop3-movemail):
+	* gnus-html.el (gnus-html-wash-tags): Don't use plusp, as cl may not be
+	loaded.
+
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
 	* nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index a6a243adc09..c007f71f64c 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -271,7 +271,7 @@ Use ALT-TEXT for the image string."
       (setq tag (match-string 1)
 	    parameters (match-string 2)
 	    start (match-beginning 0))
-      (when (plusp (length parameters))
+      (when (> (length parameters) 0)
 	(set-text-properties 0 (1- (length parameters)) nil parameters))
       (delete-region start (point))
       (when (search-forward (concat "</" tag ">") nil t)
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 20fe5609150..327c5297492 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -149,7 +149,7 @@ Use streaming commands."
       (let ((size (pop3-stat process)))
 	(setq message-count (car size)
 	      message-total-size (cadr size)))
-      (when (plusp message-count)
+      (when (> message-count 0)
 	(pop3-send-streaming-command
 	 process "RETR" message-count message-total-size)
 	(pop3-write-to-file file)
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 4a778b892de..2b53fee6f06 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -220,7 +220,7 @@ fit these criteria."
     (let (column)
       (dolist (elem (split-string text))
 	(setq column (current-column))
-	(when (plusp column)
+	(when (> column 0)
 	  (if (> (+ column (length elem) 1) shr-width)
 	      (insert "\n")
 	    (insert " ")))