[Erbot-cvs] Changes to erbot/erbc.el

[D . Goel]

Index: erbot/erbc.el
diff -u erbot/erbc.el:1.76 erbot/erbc.el:1.77
--- erbot/erbc.el:1.76  Sat Jan  8 04:08:55 2005
+++ erbot/erbc.el       Sat Jan  8 05:17:47 2005
@@ -1,5 +1,5 @@
 ;;; erbc.el --- Erbot user-interface commands.
-;; Time-stamp: <2005-01-06 17:19:18 deego>
+;; Time-stamp: <2005-01-08 00:16:38 deego>
 ;; Copyright (C) 2002 D. Goel
 ;; Emacs Lisp Archive entry
 ;; Filename: erbc.el
@@ -1252,12 +1252,32 @@
 
 (defalias 'fs-fuck 'fs-love)
 
+
+
 (defun fs-flame (&rest args)
   "Doesn't really flame right now..
 Optional argument ARGS ."
   (let ((target
         (if (first args)
             (format "%s" (first args))
+          erbot-end-user-nick))
+       (flames (ignore-errors (fs-notes "flames"))))
+    (if (string= (format "%s" target) "me")
+       (setq target erbot-end-user-nick))
+    ;; Check for flame.el support
+    (cond
+     ((and (consp flames) (> (length flames) 0))
+      (concat target ": " (fs-random-choose flames)))
+     (t (fs-flame-mild target)))))
+
+
+
+(defun fs-flame-mild (&rest args)
+  "Doesn't really flame right now..
+Optional argument ARGS ."
+  (let ((target
+        (if (first args)
+            (format "%s" (first args))
           erbot-end-user-nick)))
     (if (string= (format "%s" target) "me")
        (setq target erbot-end-user-nick))
@@ -4244,7 +4264,13 @@
 (defalias 'fsi-and 'and)
 (defalias 'fsi-or 'or)
 (defalias 'fs-lart 'fs-flame)
+
 (defalias 'fsi-null 'null)
+(defalias 'fsi-atom 'null)
+(defalias 'fsi-stringp 'null)
+(defalias 'fsi-consp 'null)
+
+
 
 (defalias 'fsi-equal 'equal)
 (defalias 'fsi-equalp 'equalp)