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 446d3877d319094bcb7bee470d6ea8b4db022235..54519bc205480fc425d3ac6b045230dea7f01800 100644 (file)
--- 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 a6a243adc09ed1e892854f30d2697b8a5245cbc5..c007f71f64c4d3da47522c09236ff2e80a66b258 100644 (file)
--- 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 20fe5609150db843254dbb2ba1168cdf2f92a90e..327c52974925463d1bd7a4f403c9bd0aca0cbaf0 100644 (file)
--- 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 4a778b892de1ac4afa57345f177b041878630935..2b53fee6f0654ebb6afd564e3ca64b6ce9935931 100644 (file)
--- 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 " ")))