[Erbot-cvs] erbot ChangeLog erbc.el

[D. Goel]

CVSROOT:        /cvsroot/erbot
Module name:    erbot
Changes by:     D. Goel <deego> 07/12/06 16:25:42

Modified files:
        .              : ChangeLog erbc.el 

Log message:
        Fix buggy calls to error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/ChangeLog?cvsroot=erbot&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/erbot/erbc.el?cvsroot=erbot&r1=1.128&r2=1.129

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/erbot/erbot/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- ChangeLog   22 Jul 2007 23:26:03 -0000      1.68
+++ ChangeLog   6 Dec 2007 16:25:41 -0000       1.69
@@ -1,3 +1,17 @@
+2007-12-06  D. Goel  <address@hidden>
+
+       * erbc.el (fsi-replace-regexp): fix call to `error'.
+       (fsi-merge-generic): Ditto.     
+       (fsi-mv): "
+       (fsi-replace-string): "
+       and many other functions and files: Ditto.
+       
+2007-11-23  Dave Goel  <address@hidden>
+
+       * COPYING: Replace by GPL v. 3
+
+       * erbot.el and all other files: Change GPL v. 2 to 3.
+
 2007-07-22  Michael Olson  <address@hidden>
 
        * README.txt: Mention examples/dotemacs-mybot.

Index: erbc.el
===================================================================
RCS file: /cvsroot/erbot/erbot/erbc.el,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- erbc.el     23 Nov 2007 16:31:59 -0000      1.128
+++ erbc.el     6 Dec 2007 16:25:41 -0000       1.129
@@ -1,5 +1,5 @@
 ;;; erbc.el --- Erbot user-interface commands -- see also erbc5.el
-;; Time-stamp: <2007-11-23 11:30:12 deego>
+;; Time-stamp: <2007-12-06 11:25:03 deego>
 ;; Copyright (C) 2002 D. Goel
 ;; Emacs Lisp Archive entry
 ;; Filename: erbc.el
@@ -3662,7 +3662,7 @@
   "TODO: implemenet fixedcase, literal, subexp... If needed, let the
 author know.."
   (unless (and from to term)
-    (error (format "Syntax: %s (replace-regexp FROM TO TERM &optional NUMBER)" 
erbn-char)))
+    (error "Syntax: %s (replace-regexp FROM TO TERM &optional NUMBER" 
erbn-char)))
   (erbnocmd-iterate-internal term number 'replace-regexp-in-string from to
                             nil)
   (format "Replaced regexp %S with %S" from to))
@@ -3693,7 +3693,7 @@
 
 (defun fsi-merge-generic (&optional name dest &rest args)
   (unless (and name dest (not args))
-    (error (format "Syntax: %s merge TERM1 TERM2" erbn-char)))
+    (error "Syntax: %s merge TERM1 TERM2" erbn-char))
   (setq name (format "%s" name))
   (setq dest (format "%s" dest))
   (when (string= (downcase name) (downcase dest))
@@ -3740,7 +3740,7 @@
 Do not confuse this function with fs-rearrange which rearranges the
 order of entries within a given term. "
   (when (or args (not (and name dest)))
-    (error (format "Format: %s mv foo bar" erbn-char)))
+    (error "Format: %s mv foo bar" erbn-char))
   (setq name (format "%s" name))
   (setq dest (format "%s" dest))
   (cond
@@ -3954,7 +3954,7 @@
 (defun fsi-replace-string (&optional from to term number)
   (unless (and from to term)
     (error
-     (format "Syntax: %s s/foo.../bar in TERM [NUMBER or ALL]" erbn-char)))
+     "Syntax: %s s/foo.../bar in TERM [NUMBER or ALL]" erbn-char))
   (erbot-working
    (erbnocmd-iterate-internal
     (or (erbbdb-get-exact-name term ) term)
@@ -4043,12 +4043,12 @@
 
 (defun fsi-info-file (&optional infofile regexp)
   (unless regexp
-    (error (format "Syntax: %s info-node nodename REGEXP" erbn-char)))
+    (error "Syntax: %s info-node nodename REGEXP" erbn-char))
   (unless (stringp regexp) (setq regexp (format "%s" regexp)))
 
 
-  (unless infofile (error (format "Syntax: %s info info-file REGEXP"
-                             erbn-char)))
+  (unless infofile (error "Syntax: %s info info-file REGEXP"
+                             erbn-char))
   (unless (stringp infofile) (setq infofile (format "%s" infofile)))
 
   (cond
@@ -4086,7 +4086,7 @@
 
 
 (defun fsi-dict (&optional word &rest ignore)
-  (unless word (error (format "Syntax: %s d[ict] word" erbn-char)))
+  (unless word (error "Syntax: %s d[ict] word" erbn-char))
   (unless (stringp word) (setq word (format "%s" word)))
   (fs-dictionary-search word))
 
@@ -4239,7 +4239,7 @@
 
 
 (defun fsi-country (&optional ct)
-  (unless ct (error (format "Syntax: %s country NM (example , country jp)" 
erbn-char)))
+  (unless ct (error "Syntax: %s country NM (example , country jp" erbn-char)))
   (setq ct (format "%s" ct))
   (let ((addp (and (> (length ct) 1)
                   ;; does not start with .
@@ -4251,7 +4251,7 @@
 
 (defun fsi-country-search (&rest names)
   (unless names (error
-             (format "Syntax: %s country-search NM (example , country japa)" 
erbn-char)))
+             "Syntax: %s country-search NM (example , country japa" 
erbn-char)))
   (erbcountry-search
    (mapconcat (lambda (arg) (format "%s" arg)) names " ")))
 
@@ -4471,7 +4471,7 @@
               (kill-buffer ,buffer))))))))
 
 (defun fsi-web-page-title (&optional site &rest args)
-  (unless site (error (format "Syntax: %s web-page-title SITE" erbn-char)))
+  (unless site (error "Syntax: %s web-page-title SITE" erbn-char))
   (setq site (format "%s" site))
   (erbn-with-web-page-buffer site
     (let* ((case-fold-search t)
@@ -4484,7 +4484,7 @@
                 "not available")))))
 
 (defun fsi-wserver (&optional site &rest args)
-  (unless site (error (format "Syntax: %s wserver SITE" erbn-char)))
+  (unless site (error "Syntax: %s wserver SITE" erbn-char))
   (setq site (format "%s" site))
   (erbn-with-web-page-buffer site
     (buffer-substring (point-min)
@@ -4494,7 +4494,7 @@
 (defalias 'fs-webserver 'fs-wserver)
 
 (defun fsi-web (&optional site &rest args)
-  (unless site (error (format "Syntax: %s web SITE" erbn-char)))
+  (unless site (error "Syntax: %s web SITE" erbn-char))
   (setq site (format "%s" site))
   (erbn-with-web-page-buffer site
     (shell-command-on-region (or (search-forward "\n\n" nil t)