Update of /project/beirc/cvsroot/beirc In directory clnet:/tmp/cvs-serv25410
Modified Files: application.lisp message-display.lisp package.lisp Log Message: Restore compatibility with cl-irc trunk.
--- /project/beirc/cvsroot/beirc/application.lisp 2006/05/09 17:08:25 1.82 +++ /project/beirc/cvsroot/beirc/application.lisp 2006/05/29 20:05:41 1.83 @@ -328,7 +328,7 @@
(defun message-directed-to-me-p (message) - (irc:destructuring-arguments (&last body) message + (irc:destructuring-arguments (&rest :ignored &req body) message (let ((my-nick (current-nickname (irc:connection message)))) (search my-nick (or body "")))))
--- /project/beirc/cvsroot/beirc/message-display.lisp 2006/05/09 17:10:00 1.49 +++ /project/beirc/cvsroot/beirc/message-display.lisp 2006/05/29 20:05:42 1.50 @@ -308,7 +308,7 @@ (with-text-face (*standard-output* (if (message-from-focused-nick-p message receiver) :bold :roman)) - (irc:destructuring-arguments (&last body) message + (irc:destructuring-arguments (&rest :ignored &req body) message (formatting-message (t message receiver) ((write-string start-string *standard-output*) (present (irc:source message) 'unhighlighted-nickname) @@ -346,8 +346,7 @@ ,@(loop for (message-type . message-name) in message-specs collect `(defmethod print-message ((message ,message-type) receiver) - (irc:destructuring-arguments (_ &rest arguments &last body) message - (declare (ignore _)) + (irc:destructuring-arguments (:ignored &rest arguments &req body) message (formatting-message (t message receiver) ((format t "~A" (irc:source message))) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -379,7 +378,7 @@ (defmethod print-message (message receiver) ;; default message if we don't know how to render a message. #+(or) (break "~S" message) ; uncomment to debug - (irc:destructuring-arguments (&whole args &last body) message + (irc:destructuring-arguments (&whole args &rest :ignored &req body) message (formatting-message (t message receiver) ((format t "!!! ~A" (irc:source message))) ((with-drawing-options (*standard-output* :ink +red+ :text-size :small) @@ -408,7 +407,7 @@ (write-char #)))
(defmethod print-message ((message irc:irc-nick-message) receiver) - (irc:destructuring-arguments (&last body) message + (irc:destructuring-arguments (&rest :ignored &req body) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -423,16 +422,14 @@ (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) - (irc:destructuring-arguments (me nickname user host &last ircname) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored nickname user host &rest :ignored &req ircname) message (present nickname 'nickname) (format t " is ") (present-as-hostmask user host) (format t " (~A)" ircname))))))
(defmethod print-message ((message irc:irc-rpl_whoischannels-message) receiver) - (irc:destructuring-arguments (me nickname &last body) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored nickname &rest :ignored &req body) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -440,8 +437,7 @@ (format-message* (format nil " is in ~A" body) :start-length (length nickname)))))))
(defmethod print-message ((message irc:irc-rpl_whoisserver-message) receiver) - (irc:destructuring-arguments (me nickname server &last server-callout) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored nickname server &rest :ignored &req server-callout) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -450,8 +446,7 @@ :start-length (length nickname)))))))
(defmethod print-message ((message irc:irc-rpl_away-message) receiver) - (irc:destructuring-arguments (me nickname &last away-msg) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored nickname &rest :ignored &req away-msg) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -460,8 +455,7 @@ :start-length (length nickname)))))))
(defmethod print-message ((message irc:irc-rpl_whoisidentified-message) receiver) - (irc:destructuring-arguments (me nickname body) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored nickname body) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -480,8 +474,7 @@ year month date hour minute second)))
(defmethod print-message ((message irc:irc-rpl_whoisidle-message) receiver) - (irc:destructuring-arguments (me nickname idle signon &rest rest) message - (declare (ignore me rest)) + (irc:destructuring-arguments (:ignored nickname idle signon &rest :ignored) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -510,8 +503,7 @@ (defmethod print-message ((message irc:irc-err_nosuchnick-message) receiver) (formatting-message (t message receiver) ((format t " ")) - ((irc:destructuring-arguments (me target &rest rest) message - (declare (ignore me rest)) + ((irc:destructuring-arguments (:ignored target &rest :ignored) message (with-drawing-options (*standard-output* :ink +red3+ :text-size :small) (format-message* (format nil "No such nick or channel "~A". " target))) @@ -523,15 +515,14 @@ (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +red3+ :text-size :small) - (irc:destructuring-arguments (me &last msg) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored msg) message (format-message* msg) (with-drawing-options (*standard-output* :ink +grey12+ :text-size :small) (with-output-as-presentation (t `(com-identify) 'command) (format-message* "Click here to identify yourself."))))))))
(defmethod print-message ((message irc:irc-err_chanoprivsneeded-message) receiver) - (irc:destructuring-arguments (&last body) message + (irc:destructuring-arguments (:ignored body) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +red3+ :text-size :small) @@ -554,26 +545,25 @@ (format-message* (format nil " set the topic for ~A to ~A" channel topic))))))))
(defmethod print-message ((message irc:irc-topic-message) receiver) - (irc:destructuring-arguments (channel &last topic) message + (irc:destructuring-arguments (channel &rest :ignored &req topic) message (print-topic receiver message (irc:source message) channel topic)))
(defmethod print-message ((message irc:irc-rpl_topic-message) receiver) - (irc:destructuring-arguments (target channel &optional topic) message - (declare (ignore target)) + (irc:destructuring-arguments (:ignored channel &optional topic) message (print-topic receiver message nil channel topic)))
(defmethod print-message ((message irc:irc-rpl_topicwhotime-message) receiver) (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) - (irc:destructuring-arguments (me channel who time) message - (declare (ignore me)) + (irc:destructuring-arguments (:ignored channel who time) message (format-message* (format nil "~A topic set by ~A on ~A" channel who (format-unix-epoch (parse-integer time)))))))))
(defmethod print-message ((message irc:irc-rpl_namreply-message) receiver) - (irc:destructuring-arguments (me privacy channel &last nicks) message - (declare (ignore me privacy)) + (irc:destructuring-arguments (:ignored ; me + :ignored ; privacy + channel &rest :ignored &req nicks) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) @@ -600,8 +590,7 @@ (present-as-hostmask (irc:user message) (irc:host message))))))
(defmethod print-message ((message irc:irc-kick-message) receiver) - (irc:destructuring-arguments (channel victim &optional kick-msg) message - (declare (ignore channel)) + (irc:destructuring-arguments (:ignored victim &optional kick-msg) message (formatting-message (t message receiver) ((format t " ")) ((with-drawing-options (*standard-output* :ink +gray33+ :text-size :small) --- /project/beirc/cvsroot/beirc/package.lisp 2005/10/02 09:30:19 1.4 +++ /project/beirc/cvsroot/beirc/package.lisp 2006/05/29 20:05:42 1.5 @@ -4,4 +4,5 @@ #:*beirc-user-init-file* #:*hyperspec-base-url* #:*default-fill-column* #:*timestamp-column-orientation* #:*default-nick* #:*nickserv-password-alist* #:*default-web-browser - #:*auto-join-alist*)) + #:*auto-join-alist*) + (:import-from #:cl-irc #:&req))