Remove final uses of 'cl' in lisp/net

* lisp/net/pop3.el: Use lexical-binding and cl-lib.
(pop3-write-to-file): Remove unused var 'start'.
(pop3-make-date): Remove unused var 'sign'.

* lisp/net/rfc2104.el: Use lexical-binding and cl-lib.

* lisp/net/shr-color.el: Use lexical-binding and cl-lib.

* lisp/net/sieve-manage.el: Use lexical-binding and cl-lib.

1 files changed, 11 insertions, 15 deletions

diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index c2385f7f7e5..2a6807e1aca 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -1,4 +1,4 @@
-;;; pop3.el --- Post Office Protocol (RFC 1460) interface
+;;; pop3.el --- Post Office Protocol (RFC 1460) interface  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
@@ -32,7 +32,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 
 (require 'mail-utils)
 (defvar parse-time-months)
@@ -237,8 +237,8 @@ Use streaming commands."
 	(setq start-point
 	      (pop3-wait-for-messages process pop3-stream-length
 				      total-size start-point))
-	(incf waited-for pop3-stream-length))
-      (incf i))
+	(cl-incf waited-for pop3-stream-length))
+      (cl-incf i))
     (pop3-wait-for-messages process (- count waited-for)
 			    total-size start-point)))
 
@@ -249,7 +249,7 @@ Use streaming commands."
 		    (or (not total-size)
 			(re-search-forward "^\\.\r?\n" nil t)))
 	       (re-search-forward "^-ERR " nil t))
-      (decf count)
+      (cl-decf count)
       (setq start-point (point)))
     (unless (memq (process-status process) '(open run))
       (error "pop3 process died"))
@@ -269,7 +269,6 @@ Use streaming commands."
 
 (defun pop3-write-to-file (file messages)
   (let ((pop-buffer (current-buffer))
-	(start (point-min))
 	beg end
 	temp-buffer)
     (with-temp-buffer
@@ -280,7 +279,6 @@ Use streaming commands."
 	  (forward-line 1)
 	  (setq beg (point))
 	  (when (re-search-forward "^\\.\r?\n" nil t)
-	    (setq start (point))
 	    (forward-line -1)
 	    (setq end (point)))
 	  (with-current-buffer temp-buffer
@@ -369,7 +367,7 @@ Use streaming commands."
 		(while (> i 0)
 		  (unless (member (nth (1- i) pop3-uidl) saved)
 		    (push i messages))
-		  (decf i)))
+		  (cl-decf i)))
 	      (when messages
 		(setq list (pop3-list process)
 		      size 0)
@@ -399,7 +397,7 @@ Return non-nil if it is necessary to update the local UIDL file."
 	     (unless (member (setq uidl (nth i pop3-uidl)) (cdr saved))
 	       (push ctime new)
 	       (push uidl new))
-	     (decf i)))
+	     (cl-decf i)))
 	  (pop3-uidl
 	   (setq new (mapcan (lambda (elt) (list elt ctime)) pop3-uidl))))
     (when new (setq mod t))
@@ -424,7 +422,7 @@ Return non-nil if it is necessary to update the local UIDL file."
 	      (push uidl new)))
 	;; Mails having been deleted in the server.
 	(setq mod t))
-      (decf i 2))
+      (cl-decf i 2))
     (cond (saved
 	   (setcdr saved new))
 	  (srvr
@@ -440,7 +438,7 @@ Return non-nil if it is necessary to update the local UIDL file."
       (while (> i 0)
 	(when (member (nth (1- i) pop3-uidl) dele)
 	  (push i uidl))
-	(decf i))
+	(cl-decf i))
       (when uidl
 	(pop3-send-streaming-command process "DELE" uidl nil)))
     mod))
@@ -620,10 +618,8 @@ Return the response string if optional second argument is non-nil."
 If NOW, use that time instead."
   (require 'parse-time)
   (let* ((now (or now (current-time)))
-	 (zone (nth 8 (decode-time now)))
-	 (sign "+"))
+	 (zone (nth 8 (decode-time now))))
     (when (< zone 0)
-      (setq sign "-")
       (setq zone (- zone)))
     (concat
      (format-time-string "%d" now)
@@ -785,7 +781,7 @@ Otherwise, return the size of the message-id MSG"
   (pop3-send-command process (format "DELE %s" msg))
   (pop3-read-response process))
 
-(defun pop3-noop (process msg)
+(defun pop3-noop (process _msg)
   "No-operation."
   (pop3-send-command process "NOOP")
   (pop3-read-response process))