cd ~/lisp/ diff -u /home/walters/lisp/nndiary.el\~ /home/walters/lisp/nndiary.el --- /home/walters/lisp/nndiary.el~ Wed Aug 8 13:55:57 2001 +++ /home/walters/lisp/nndiary.el Wed Aug 8 21:08:48 2001 @@ -197,6 +197,13 @@ (require 'gnus-start) (require 'gnus-sum) +;; Compatibility Functions ================================================= + +(if (fboundp 'signal-error) + (defun nndiary-error (&rest args) + (apply #'signal-error 'nndiary args)) + (defun nndiary-error (&rest args) + (apply #'error args))) ;; Backend behavior customization =========================================== @@ -1258,12 +1265,12 @@ ;; within the specified bounds. ;; Signals are caught by `nndiary-schedule'. (if (not (string-match "^[ \t]*[0-9]+[ \t]*$" str)) - (signal-error 'nndiary "not an integer value") + (nndiary-error "not an integer value") ;; else (let ((val (string-to-int str))) (and (or (< val min) (and max (> val max))) - (signal-error 'nndiary "value out of range")) + (nndiary-error "value out of range")) val))) (defun nndiary-parse-schedule-value (str min-or-values max) @@ -1280,7 +1287,7 @@ (match-string 1 str)))) (if (and val (setq val (assoc val min-or-values))) (list (cadr val)) - (signal-error 'nndiary "invalid syntax"))) + (nndiary-error "invalid syntax"))) ;; min-or-values is min (mapcar (lambda (val) @@ -1300,7 +1307,7 @@ (t (cons end beg))))) (t - (signal-error 'nndiary "invalid syntax"))) + (nndiary-error "invalid syntax"))) )) (split-string str ","))) )) @@ -1315,7 +1322,7 @@ (let ((header (format "^X-Diary-%s: \\(.*\\)$" head))) (goto-char (point-min)) (if (not (re-search-forward header nil t)) - (signal-error 'nndiary "header missing") + (nndiary-error "header missing") ;; else (nndiary-parse-schedule-value (match-string 1) min-or-values max)) )) Diff finished at Wed Aug 8 21:14:42