* dgnushack.el: Load gnus-clfns.el after `load-path' is adjusted.

* gnus-clfns.el (string): Defun-maybe as an ordinary function since it won't
 be provided in cl.

diff --git a/ChangeLog b/ChangeLog
index ebe1089..9e3ef37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2001-03-08  Katsumi Yamaoka <yamaoka@jpl.org>
 
+       * lisp/dgnushack.el: Load gnus-clfns.el after `load-path' is
+       adjusted.
+
        * lisp/gnus-clfns.el (string): New compiler macro.
+       (string): Defun-maybe as an ordinary function since it won't be
+       provided in cl.
        * lisp/gnus-score.el (gnus-score-find-bnews): Use it as Gnus does.
 
 2001-03-06  Katsumi Yamaoka <yamaoka@jpl.org>

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index a24b96b..53e4230 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -111,8 +111,6 @@
       (si:byte-optimize-form-code-walker form for-effect)))
   (byte-compile 'byte-optimize-form-code-walker))
 
-(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
-
 (condition-case nil
     (char-after)
   (wrong-number-of-arguments
@@ -163,6 +161,8 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
 (push srcdir load-path)
 (load (expand-file-name "lpath.el" srcdir) nil t t)
 
+(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
+
 (require 'custom)
 
 ;; Bind functions defined by `defun-maybe'.

diff --git a/lisp/gnus-clfns.el b/lisp/gnus-clfns.el
index eeaed81..c9257cd 100644 (file)
--- a/lisp/gnus-clfns.el
+++ b/lisp/gnus-clfns.el
@@ -23,13 +23,16 @@
 
 ;;; Commentary:
 
-;; Avoid cl runtime functions for FSF Emacsen.
+;; This module is for mainly avoiding cl runtime functions in FSF
+;; Emacsen.  Function should also be defined as an ordinary function
+;; if it will not be provided in cl.
 
 ;;; Code:
 
 (if (featurep 'xemacs)
     nil
   (require 'cl)
+  (require 'pym)
 
   (define-compiler-macro butlast (&whole form x &optional n)
     (if (and (fboundp 'butlast)
@@ -117,6 +120,10 @@
        form
       (list 'concat (cons 'list args))))
 
+  (defun-maybe string (&rest args)
+    "Concatenate all the argument characters and make the result a string."
+    (concat args))
+
   (define-compiler-macro subseq (&whole form seq start &optional end)
     (if (and (fboundp 'subseq)
             (subrp (symbol-function 'subseq)))