changeset 110740:ed9ff0bf7851

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.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 03 Oct 2010 15:54:31 -0400
parents 4379d5736f65
children d90a3bc6b730
files lisp/gnus/ChangeLog lisp/gnus/gnus-html.el lisp/gnus/pop3.el lisp/gnus/shr.el
diffstat 4 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sun Oct 03 18:43:22 2010 +0200
+++ b/lisp/gnus/ChangeLog	Sun Oct 03 15:54:31 2010 -0400
@@ -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.
--- a/lisp/gnus/gnus-html.el	Sun Oct 03 18:43:22 2010 +0200
+++ b/lisp/gnus/gnus-html.el	Sun Oct 03 15:54:31 2010 -0400
@@ -271,7 +271,7 @@
       (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)
--- a/lisp/gnus/pop3.el	Sun Oct 03 18:43:22 2010 +0200
+++ b/lisp/gnus/pop3.el	Sun Oct 03 15:54:31 2010 -0400
@@ -149,7 +149,7 @@
       (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)
--- a/lisp/gnus/shr.el	Sun Oct 03 18:43:22 2010 +0200
+++ b/lisp/gnus/shr.el	Sun Oct 03 15:54:31 2010 -0400
@@ -220,7 +220,7 @@
     (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 " ")))