Smiley for Emacs 21.

[gnus] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index b41d06a..1033470 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,5 +1,6 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994-2000 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Version: 4.19
@@ -30,6 +31,14 @@
 
 (require 'cl)
 
+(defvar srcdir (or (getenv "srcdir") "."))
+
+(push (or (getenv "lispdir") 
+         "/usr/share/emacs/site-lisp")
+      load-path)
+(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir)) 
+      load-path)
+
 (unless (featurep 'xemacs)
   (define-compiler-macro last (&whole form x &optional n)
     (if (and (fboundp 'last)
@@ -52,57 +61,6 @@
           (while (consp (cdr x))
             (pop x))
           x))))
-
-  (define-compiler-macro mapcon (&whole form fn seq &rest rest)
-    (if (and (fboundp 'mapcon)
-            (subrp (symbol-function 'mapcon)))
-       form
-      (if rest
-         `(let (res
-                (args (list ,seq ,@rest))
-                p)
-            (while (not (memq nil args))
-              (push (apply ,fn args) res)
-              (setq p args)
-              (while p
-                (setcar p (cdr (pop p)))
-                ))
-            (apply (function nconc) (nreverse res)))
-       `(let (res
-              (arg ,seq))
-          (while arg
-            (push (funcall ,fn arg) res)
-            (setq arg (cdr arg)))
-          (apply (function nconc) (nreverse res))))))
-
-  (define-compiler-macro member-if (&whole form pred list)
-    (if (and (fboundp 'member-if)
-            (subrp (symbol-function 'member-if)))
-       form
-      `(let ((fn ,pred)
-            (seq ,list))
-        (while (and seq
-                    (not (funcall fn (car seq))))
-          (pop seq))
-        seq)))
-
-  (define-compiler-macro union (&whole form list1 list2)
-    (if (and (fboundp 'union)
-            (subrp (symbol-function 'union)))
-       form
-      `(let ((a ,list1)
-            (b ,list2))
-        (cond ((null a) b)
-              ((null b) a)
-              ((equal a b) a)
-              (t
-               (or (>= (length a) (length b))
-                   (setq a (prog1 b (setq b a))))
-               (while b
-                 (or (memq (car b) a)
-                     (push (car b) a))
-                 (pop b))
-               a)))))
   )
 
 ;; If we are building w3 in a different directory than the source
@@ -125,8 +83,6 @@
 
 (require 'bytecomp)
 
-(defvar srcdir (or (getenv "srcdir") "."))
-
 (push srcdir load-path)
 ;(push "/usr/share/emacs/site-lisp" load-path)
 (load (expand-file-name "lpath.el" srcdir) nil t)
@@ -173,8 +129,7 @@ Modify to suit your needs."))
       (when (or (and (not xemacs)
                     (not (member (file-name-nondirectory file)
                                  '("gnus-xmas.el" "gnus-picon.el"
-                                   "messagexmas.el" "nnheaderxm.el"
-                                   "smiley.el" "x-overlay.el"))))
+                                   "messagexmas.el" "nnheaderxm.el"))))
                (and xemacs
                     (not (member file '("md5.el")))))
        (when (or (not (file-exists-p (setq elc (concat file "c"))))