* riece-complete.el: Require 'cl for butlast.

* Don't use pop and push.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cca77eb..9b8c879 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2003-05-30  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece-complete.el: Require 'cl for butlast.
+
        * Makefile.am (elc): Renamed from "compile".
 
        * riece.el (riece-dialogue-mode-map): Bind

diff --git a/lisp/riece-complete.el b/lisp/riece-complete.el
index 902d364..7d945cd 100644 (file)
--- a/lisp/riece-complete.el
+++ b/lisp/riece-complete.el
@@ -24,6 +24,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))      ;butlast
+
 (require 'riece-compat)
 
 (defvar riece-minibuffer-map

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 51fc346..4bd4101 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -42,8 +42,8 @@
             (riece-prefix-nickname prefix))
     (let* ((user (riece-prefix-nickname prefix))
           (parameters (riece-split-parameters string))
-          (targets (split-string (pop parameters) ","))
-          (message (pop parameters)))
+          (targets (split-string (car parameters) ","))
+          (message (nth 1 parameters)))
       (if (string-match "\1\\([^ ]+\\)\\( .+\\)?\1" message)
          (let ((request (downcase (match-string 1 message))))
            (if (match-beginning 2)
@@ -117,8 +117,8 @@
             (riece-prefix-nickname prefix))
     (let* ((user (riece-prefix-nickname prefix))
           (parameters (riece-split-parameters string))
-          (targets (split-string (pop parameters) ","))
-          (message (pop parameters)))
+          (targets (split-string (car parameters) ","))
+          (message (nth 1 parameters)))
       (if (string-match "\1\\([^ ]+\\)\\( .+\\)?\1" message)
          (let ((response (downcase (match-string 1 message))))
            (if (match-beginning 2)