Avoid using plusp; cl may not be loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a994a2..b9a37b6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -53,6 +53,13 @@
        Rename tag functions to shr-tag-* for enhanced security.
        (shr-tag-ul, shr-tag-ol, shr-tag-li, shr-tag-br): New functions.
 
+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-html.el b/lisp/gnus-html.el
index 732fcdd..0f8ba83 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -266,7 +266,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/pop3.el b/lisp/pop3.el
index 20fe560..327c529 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/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/shr.el b/lisp/shr.el
index 5b5ac5f..9ef1691 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -142,7 +142,7 @@ fit these criteria."
   (browse-url (widget-get widget :url)))
 
 (defun shr-tag-img (cont)
-  (when (and (plusp (current-column))
+  (when (and (> (current-column) 0)
             (not (eq shr-state 'image)))
     (insert "\n"))
   (let ((start (point-marker)))
@@ -242,7 +242,7 @@ fit these criteria."
        (insert " "))
       (dolist (elem (split-string text))
        (setq column (current-column))
-       (when (plusp column)
+       (when (> column 0)
          (cond
           ((> (+ column (length elem) 1) shr-width)
            (insert "\n"))
@@ -250,7 +250,7 @@ fit these criteria."
            (insert " "))))
        (setq first nil)
        (when (and (bolp)
-                  (plusp shr-indentation))
+                  (> shr-indentation 0))
          (insert (make-string shr-indentation ? )))
        ;; The shr-start is a special variable that is used to pass
        ;; upwards the first point in the buffer where the text really