[Erbot-cvs] erbot ChangeLog erbc.el

[Michael W. Olson]

CVSROOT:        /cvsroot/erbot
Module name:    erbot
Branch:         
Changes by:     Michael W. Olson <address@hidden>       06/02/27 02:56:12

Modified files:
        .              : ChangeLog erbc.el 

Log message:
        Revision: address@hidden/erbot--cvs--0--patch-9
        
        Make flaming handle multiple arguments better.
        
        * erbc.el (fs-flame): Concat multiple arguments together to form the
        flame target, unless there are only 2 arguments and the last one is a
        number.  In that case, we pick the specified flame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot/ChangeLog.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot/erbc.el.diff?tr1=1.119&tr2=1.120&r1=text&r2=text

Patches:
Index: erbot/ChangeLog
diff -u erbot/ChangeLog:1.36 erbot/ChangeLog:1.37
--- erbot/ChangeLog:1.36        Tue Jan 10 15:37:13 2006
+++ erbot/ChangeLog     Mon Feb 27 02:56:12 2006
@@ -1,3 +1,9 @@
+2006-02-26  Michael Olson  <address@hidden>
+
+       * erbc.el (fs-flame): Concat multiple arguments together to form
+       the flame target, unless there are only 2 arguments and the last
+       one is a number.  In that case, we pick the specified flame.
+
 2006-01-10  D Goel  <address@hidden>
 
        * erbc5.el (symbol-name): minor: provide this fs-function.
@@ -75,7 +81,7 @@
 2005-10-05  D Goel  <address@hidden>
 
        * erbot.el (erbot-join-servers): `erc-compute-port' seems to be
-       undefined for my older ERC (4.0 $Revision: 1.36 $).  So, I
+       undefined for my older ERC (4.0 $Revision: 1.37 $).  So, I
        reverted to old behavior when it is undefined.  Did I do it right?
 
 2005-10-05  Michael Olson  <address@hidden>
Index: erbot/erbc.el
diff -u erbot/erbc.el:1.119 erbot/erbc.el:1.120
--- erbot/erbc.el:1.119 Mon Feb 13 19:26:06 2006
+++ erbot/erbc.el       Mon Feb 27 02:56:12 2006
@@ -1321,21 +1321,28 @@
 
 (defun fs-flame (&rest args)
   ""
-  (let ((fs-flame-target
-        (if (first args)
-            (format "%s" (first args))
-          erbot-end-user-nick))
-       (num (second args))
-       (flames (ignore-errors (fs-notes "flames"))))
+  (let ((flames (ignore-errors (fs-notes "flames")))
+        fs-flame-target num)
+    (cond ((and (numberp (cadr args))
+                (not (cddr args)))
+           (setq fs-flame-target (car args)
+                 num (cadr args)))
+          ((consp (cdr args))
+           (setq fs-flame-target (mapconcat (lambda (arg)
+                                              (format "%s" arg))
+                                            args " ")))
+          ((car args)
+           (setq fs-flame-target (format "%s" (car args))))
+          (t (setq fs-flame-target (format "%s" erbot-end-user-nick))))
     (if (string= (format "%s" fs-flame-target) "me")
-       (setq fs-flame-target erbot-end-user-nick))
+        (setq fs-flame-target erbot-end-user-nick))
     ;; Check for flame.el support
     (cond
      ((and (consp flames) (> (length flames) 0))
       (fsi-eval-or-say
-       (if (numberp num)
-          (nth num flames)
-        (fs-random-choose flames))
+       (if num
+           (nth num flames)
+         (fs-random-choose flames))
        fs-flame-target))
      (t (fs-flame-mild fs-flame-target)))))