1 files changed, 50 insertions, 49 deletions

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 7cb6fbb595b..cec9718e751 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -67,7 +67,7 @@
 (defconst erc-version-string "Version 5.3"
   "ERC version.  This is used by function `erc-version'.")
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 (require 'font-lock)
 (require 'pp)
 (require 'thingatpt)
@@ -369,7 +369,7 @@ If no server buffer exists, return nil."
          (with-current-buffer ,buffer
            ,@body)))))
 
-(defstruct (erc-server-user (:type vector) :named)
+(cl-defstruct (erc-server-user (:type vector) :named)
   ;; User data
   nickname host login full-name info
   ;; Buffers
@@ -379,7 +379,7 @@ If no server buffer exists, return nil."
   (buffers nil)
   )
 
-(defstruct (erc-channel-user (:type vector) :named)
+(cl-defstruct (erc-channel-user (:type vector) :named)
   op voice
   ;; Last message time (in the form of the return value of
   ;; (current-time)
@@ -1386,7 +1386,7 @@ If BUFFER is nil, the current buffer is used."
           t))
       (erc-server-send (format "ISON %s" nick))
       (while (eq erc-online-p 'unknown) (accept-process-output))
-      (if (interactive-p)
+      (if (called-interactively-p 'interactive)
           (message "%s is %sonline"
                    (or erc-online-p nick)
                    (if erc-online-p "" "not "))
@@ -2157,11 +2157,11 @@ functions in here get called with the parameters SERVER and NICK."
     (list :server server :port port :nick nick :password passwd)))
 
 ;;;###autoload
-(defun* erc (&key (server (erc-compute-server))
-                  (port   (erc-compute-port))
-                  (nick   (erc-compute-nick))
-                  password
-                  (full-name (erc-compute-full-name)))
+(cl-defun erc (&key (server (erc-compute-server))
+                    (port   (erc-compute-port))
+                    (nick   (erc-compute-nick))
+                    password
+                    (full-name (erc-compute-full-name)))
   "ERC is a powerful, modular, and extensible IRC client.
 This function is the main entry point for ERC.
 
@@ -2383,24 +2383,24 @@ If STRING is nil, the function does nothing."
       (while list
         (setq elt (car list))
         (cond ((integerp elt)           ; POSITION
-               (incf (car list) shift))
+               (cl-incf (car list) shift))
               ((or (atom elt)           ; nil, EXTENT
                    ;; (eq t (car elt))  ; (t . TIME)
                    (markerp (car elt))) ; (MARKER . DISTANCE)
                nil)
               ((integerp (car elt))     ; (BEGIN . END)
-               (incf (car elt) shift)
-               (incf (cdr elt) shift))
+               (cl-incf (car elt) shift)
+               (cl-incf (cdr elt) shift))
               ((stringp (car elt))      ; (TEXT . POSITION)
-               (incf (cdr elt) (* (if (natnump (cdr elt)) 1 -1) shift)))
+               (cl-incf (cdr elt) (* (if (natnump (cdr elt)) 1 -1) shift)))
               ((null (car elt))         ; (nil PROPERTY VALUE BEG . END)
                (let ((cons (nthcdr 3 elt)))
-                 (incf (car cons) shift)
-                 (incf (cdr cons) shift)))
+                 (cl-incf (car cons) shift)
+                 (cl-incf (cdr cons) shift)))
               ((and (featurep 'xemacs)
                     (extentp (car elt))) ; (EXTENT START END)
-               (incf (nth 1 elt) shift)
-               (incf (nth 2 elt) shift)))
+               (cl-incf (nth 1 elt) shift)
+               (cl-incf (nth 2 elt) shift)))
         (setq list (cdr list))))))
 
 (defvar erc-valid-nick-regexp "[]a-zA-Z^[;\\`_{}|][]^[;\\`_{}|a-zA-Z0-9-]*"
@@ -2477,6 +2477,13 @@ purposes."
   :group 'erc-lurker
   :type 'boolean)
 
+(defcustom erc-lurker-ignore-chars "`_"
+  "Characters at the end of a nick to strip for activity tracking purposes.
+
+See also `erc-lurker-trim-nicks'."
+  :group 'erc-lurker
+  :type 'string)
+
 (defun erc-lurker-maybe-trim (nick)
   "Maybe trim trailing `erc-lurker-ignore-chars' from NICK.
 
@@ -2491,13 +2498,6 @@ non-nil."
        "" nick)
     nick))
 
-(defcustom erc-lurker-ignore-chars "`_"
-  "Characters at the end of a nick to strip for activity tracking purposes.
-
-See also `erc-lurker-trim-nicks'."
-  :group 'erc-lurker
-  :type 'string)
-
 (defcustom erc-lurker-hide-list nil
   "List of IRC type messages to hide when sent by lurkers.
 
@@ -2580,7 +2580,8 @@ updates of `erc-lurker-state'."
            (server
             (erc-canonicalize-server-name erc-server-announced-name)))
       (when (equal command "PRIVMSG")
-        (when (>= (incf erc-lurker-cleanup-count) erc-lurker-cleanup-interval)
+        (when (>= (cl-incf erc-lurker-cleanup-count)
+                  erc-lurker-cleanup-interval)
           (setq erc-lurker-cleanup-count 0)
           (erc-lurker-cleanup))
         (unless (gethash server erc-lurker-state)
@@ -2605,6 +2606,17 @@ server within `erc-lurker-threshold-time'.  See also
               (time-subtract (current-time) last-PRIVMSG-time))
            erc-lurker-threshold-time))))
 
+(defcustom erc-common-server-suffixes
+  '(("openprojects.net$" . "OPN")
+    ("freenode.net$" . "freenode")
+    ("oftc.net$" . "OFTC"))
+  "Alist of common server name suffixes.
+This variable is used in mode-line display to save screen
+real estate.  Set it to nil if you want to avoid changing
+displayed hostnames."
+  :group 'erc-mode-line-and-header
+  :type 'alist)
+
 (defun erc-canonicalize-server-name (server)
   "Returns the canonical network name for SERVER if any,
 otherwise `erc-server-announced-name'.  SERVER is matched against
@@ -3115,37 +3127,37 @@ If SERVER is non-nil, use that, rather than the current server."
       (add-to-list 'symlist
                    (cons (erc-once-with-server-event
                           311 `(string= ,nick
-                                        (second
+                                        (nth 1
                                          (erc-response.command-args parsed))))
                          'erc-server-311-functions))
       (add-to-list 'symlist
                    (cons (erc-once-with-server-event
                           312 `(string= ,nick
-                                        (second
+                                        (nth 1
                                          (erc-response.command-args parsed))))
                          'erc-server-312-functions))
       (add-to-list 'symlist
                    (cons (erc-once-with-server-event
                           318 `(string= ,nick
-                                        (second
+                                        (nth 1
                                          (erc-response.command-args parsed))))
                          'erc-server-318-functions))
       (add-to-list 'symlist
                    (cons (erc-once-with-server-event
                           319 `(string= ,nick
-                                        (second
+                                        (nth 1
                                          (erc-response.command-args parsed))))
                          'erc-server-319-functions))
       (add-to-list 'symlist
                    (cons (erc-once-with-server-event
                           320 `(string= ,nick
-                                        (second
+                                        (nth 1
                                          (erc-response.command-args parsed))))
                          'erc-server-320-functions))
       (add-to-list 'symlist
                    (cons (erc-once-with-server-event
                           330 `(string= ,nick
-                                        (second
+                                        (nth 1
                                          (erc-response.command-args parsed))))
                          'erc-server-330-functions))
       (add-to-list 'symlist
@@ -4328,8 +4340,8 @@ See also: `erc-echo-notice-in-user-buffers',
 
 (defun erc-banlist-store (proc parsed)
   "Record ban entries for a channel."
-  (multiple-value-bind (channel mask whoset)
-      (values-list (cdr (erc-response.command-args parsed)))
+  (pcase-let ((`(,channel ,mask ,whoset)
+               (cdr (erc-response.command-args parsed))))
     ;; Determine to which buffer the message corresponds
     (let ((buffer (erc-get-buffer channel proc)))
       (with-current-buffer buffer
@@ -4340,7 +4352,7 @@ See also: `erc-echo-notice-in-user-buffers',
 
 (defun erc-banlist-finished (proc parsed)
   "Record that we have received the banlist."
-  (let* ((channel (second (erc-response.command-args parsed)))
+  (let* ((channel (nth 1 (erc-response.command-args parsed)))
          (buffer (erc-get-buffer channel proc)))
     (with-current-buffer buffer
       (put 'erc-channel-banlist 'received-from-server t)))
@@ -4349,7 +4361,7 @@ See also: `erc-echo-notice-in-user-buffers',
 (defun erc-banlist-update (proc parsed)
   "Check MODE commands for bans and update the banlist appropriately."
   ;; FIXME: Possibly incorrect. -- Lawrence 2004-05-11
-  (let* ((tgt (first (erc-response.command-args parsed)))
+  (let* ((tgt (car (erc-response.command-args parsed)))
          (mode (erc-response.contents parsed))
          (whoset (erc-response.sender parsed))
          (buffer (erc-get-buffer tgt proc)))
@@ -6000,7 +6012,7 @@ entry of `channel-members'."
       (if cuser
           (setq op (erc-channel-user-op cuser)
                 voice (erc-channel-user-voice cuser)))
-      (if (interactive-p)
+      (if (called-interactively-p 'interactive)
           (message "%s is %s@%s%s%s"
                    nick login host
                    (if full-name (format " (%s)" full-name) "")
@@ -6088,17 +6100,6 @@ Otherwise, use the `erc-header-line' face."
   :group 'erc-paranoia
   :type 'boolean)
 
-(defcustom erc-common-server-suffixes
-  '(("openprojects.net$" . "OPN")
-    ("freenode.net$" . "freenode")
-    ("oftc.net$" . "OFTC"))
-  "Alist of common server name suffixes.
-This variable is used in mode-line display to save screen
-real estate.  Set it to nil if you want to avoid changing
-displayed hostnames."
-  :group 'erc-mode-line-and-header
-  :type 'alist)
-
 (defcustom erc-mode-line-away-status-format
   "(AWAY since %a %b %d %H:%M) "
   "When you're away on a server, this is shown in the mode line.
@@ -6302,7 +6303,7 @@ If optional argument HERE is non-nil, insert version number at point."
          (format "ERC %s (GNU Emacs %s)" erc-version-string emacs-version)))
     (if here
         (insert version-string)
-      (if (interactive-p)
+      (if (called-interactively-p 'interactive)
           (message "%s" version-string)
         version-string))))
 
@@ -6322,7 +6323,7 @@ If optional argument HERE is non-nil, insert version number at point."
                     ", ")))
     (if here
         (insert string)
-      (if (interactive-p)
+      (if (called-interactively-p 'interactive)
           (message "%s" string)
         string))))