From 7a1583e000f9210a4df021ee7ede314a647ef388 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 22 Nov 1999 07:09:44 +0000 Subject: [PATCH] Require `cl' at the top level. --- lisp/earcon.el | 2 +- lisp/gnus-agent.el | 5 ++--- lisp/gnus-art.el | 11 +++++------ lisp/gnus-async.el | 3 +-- lisp/gnus-cite.el | 3 +-- lisp/gnus-group.el | 3 +-- lisp/gnus-kill.el | 3 +-- lisp/gnus-logic.el | 3 +-- lisp/gnus-mailcap.el | 3 +-- lisp/gnus-mlspl.el | 1 + lisp/gnus-offline.el | 4 ++-- lisp/gnus-ofsetup.el | 4 +++- lisp/gnus-picon.el | 2 +- lisp/gnus-range.el | 2 +- lisp/gnus-salt.el | 3 +-- lisp/gnus-score.el | 3 +-- lisp/gnus-spec.el | 3 +-- lisp/gnus-srvr.el | 3 +-- lisp/gnus-sum.el | 3 +-- lisp/gnus-topic.el | 3 +-- lisp/gnus-win.el | 3 +-- lisp/imap.el | 2 +- lisp/message.el | 7 ++----- lisp/nnbabyl.el | 2 +- lisp/nndoc.el | 2 +- lisp/nneething.el | 3 +-- lisp/nnheader.el | 3 +-- lisp/nnimap.el | 4 ++-- lisp/nnlistserv.el | 3 +-- lisp/nnmail.el | 3 +-- lisp/nnmbox.el | 4 ++-- lisp/nnmh.el | 2 +- lisp/nnml.el | 2 +- lisp/nnoo.el | 2 +- lisp/nnsoup.el | 2 +- lisp/nnspool.el | 2 +- lisp/nntp.el | 3 +-- lisp/nnvirtual.el | 2 +- lisp/nnweb.el | 3 +-- lisp/pop3.el | 1 + lisp/smiley.el | 2 +- lisp/time-date.el | 1 + 42 files changed, 53 insertions(+), 72 deletions(-) diff --git a/lisp/earcon.el b/lisp/earcon.el index a698479..e834156 100644 --- a/lisp/earcon.el +++ b/lisp/earcon.el @@ -25,7 +25,7 @@ (if (null (boundp 'running-xemacs)) (defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))) -(eval-when-compile (require 'cl)) +(require 'cl) (require 'gnus) (require 'gnus-audio) (require 'gnus-art) diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 858d5b7..823e940 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -24,13 +24,12 @@ ;;; Code: +(require 'cl) (require 'gnus) (require 'gnus-cache) (require 'nnvirtual) (require 'gnus-sum) -(eval-when-compile - (require 'cl) - (require 'gnus-score)) +(eval-when-compile (require 'gnus-score)) (defcustom gnus-agent-directory (nnheader-concat gnus-directory "agent/") "Where the Gnus agent will store its files." diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index dc64a45..f656893 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -27,9 +27,8 @@ ;;; Code: -(eval-when-compile - (require 'cl) - (require 'static)) +(require 'cl) +(eval-when-compile (require 'static)) (require 'path-util) (require 'custom) @@ -2267,8 +2266,8 @@ This format is defined by the `gnus-article-time-format' variable." (let ((name (and gnus-newsgroup-name (gnus-group-real-name gnus-newsgroup-name)))) (make-local-variable 'gnus-article-emphasis-alist) - (setq gnus-article-emphasis-alist - (nconc + (setq gnus-article-emphasis-alist + (nconc (let ((alist gnus-group-highlight-words-alist) elem highlight) (while (setq elem (pop alist)) (when (and name (string-match (car elem) name)) @@ -2277,7 +2276,7 @@ This format is defined by the `gnus-article-time-format' variable." highlight) (copy-list highlight-words) (if gnus-newsgroup-name - (copy-list (gnus-group-find-parameter + (copy-list (gnus-group-find-parameter gnus-newsgroup-name 'highlight-words t))) gnus-emphasis-alist))))) diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el index 6cfc152..3a6d4e6 100644 --- a/lisp/gnus-async.el +++ b/lisp/gnus-async.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-sum) (require 'nntp) diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index 5b2badb..0908bd1 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -20,8 +20,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-art) (require 'gnus-range) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 49fc4f2..13baa73 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-start) (require 'nnmail) diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el index 6121552..bcf430f 100644 --- a/lisp/gnus-kill.el +++ b/lisp/gnus-kill.el @@ -26,8 +26,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-art) (require 'gnus-range) diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el index 0b14ce0..5b664b8 100644 --- a/lisp/gnus-logic.el +++ b/lisp/gnus-logic.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-score) (require 'gnus-util) diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index d5330b9..31ce041 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -26,8 +26,7 @@ ;;; Code: -(eval-when-compile - (require 'cl)) +(require 'cl) (require 'mail-parse) (defvar mailcap-parse-args-syntax-table diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el index 716426e..b8bc473 100644 --- a/lisp/gnus-mlspl.el +++ b/lisp/gnus-mlspl.el @@ -19,6 +19,7 @@ ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +(require 'cl) (require 'gnus) (require 'gnus-sum) (require 'gnus-group) diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el index 909c581..9ac0604 100644 --- a/lisp/gnus-offline.el +++ b/lisp/gnus-offline.el @@ -1,5 +1,5 @@ ;;; gnus-offline.el --- To process mail & news at offline environment. -;;; $Id: gnus-offline.el,v 1.1.2.5.2.36.4.9 1999-11-19 13:14:59 yamaoka Exp $ +;;; $Id: gnus-offline.el,v 1.1.2.5.2.36.4.10 1999-11-22 07:09:32 yamaoka Exp $ ;;; Copyright (C) 1998 Tatsuya Ichikawa ;;; Yukihiro Ito @@ -78,7 +78,7 @@ (eval '(run-hooks 'gnus-offline-load-hook)) -(eval-when-compile (require 'cl)) +(require 'cl) (require 'custom) (require 'easymenu) (provide 'gnus-offline) diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el index 5aa1d03..a22f915 100644 --- a/lisp/gnus-ofsetup.el +++ b/lisp/gnus-ofsetup.el @@ -1,6 +1,6 @@ ;;; gnus-ofsetup.el --- Setup advisor for Offline reading for Mail/News. ;;; -;;; $Id: gnus-ofsetup.el,v 1.1.2.19.4.9 1999-10-24 10:27:14 czkmt Exp $ +;;; $Id: gnus-ofsetup.el,v 1.1.2.19.4.10 1999-11-22 07:09:30 yamaoka Exp $ ;;; ;;; Copyright (C) 1998 Tatsuya Ichikawa ;;; Author: Tatsuya Ichikawa @@ -32,6 +32,8 @@ ;;; Code: +(require 'cl) + (eval-and-compile (defvar gnus-offline-lang (cond ((and (featurep 'meadow) diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index 6025a0b..a5fd074 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -25,7 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl) (require 'gnus) ;; (require 'xpm) (require 'annotations) diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el index 1964880..bc9b5b2 100644 --- a/lisp/gnus-range.el +++ b/lisp/gnus-range.el @@ -25,7 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl) ;;; List and range functions diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index 60a47f4..9cd8097 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-sum) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 6eedb8e..6cb64a0 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -26,8 +26,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-sum) (require 'gnus-range) diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index ca97b05..db0dab8 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -26,8 +26,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) ;;; Internal variables. diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index d087acd..dd0514a 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-spec) (require 'gnus-group) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 32944e3..8d0aafd 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -27,8 +27,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-group) (require 'gnus-spec) diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index b8235cf..219406f 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -26,8 +26,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (require 'gnus-group) (require 'gnus-start) diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el index 254b401..3904c87 100644 --- a/lisp/gnus-win.el +++ b/lisp/gnus-win.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'gnus) (defgroup gnus-windows nil diff --git a/lisp/imap.el b/lisp/imap.el index 6507fbc..bbc4f4d 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -132,7 +132,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl) (eval-and-compile (autoload 'open-ssl-stream "ssl") diff --git a/lisp/message.el b/lisp/message.el index 4f745c7..3967f5b 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -35,11 +35,8 @@ ;;; Code: -(eval-when-compile - (require 'cl) - (require 'smtp) - ) - +(require 'cl) +(eval-when-compile (require 'smtp)) (require 'mailheader) (require 'nnheader) (require 'easymenu) diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el index f26fe4f..057d66e 100644 --- a/lisp/nnbabyl.el +++ b/lisp/nnbabyl.el @@ -29,6 +29,7 @@ ;;; Code: +(require 'cl) (require 'nnheader) (condition-case nil (require 'rmail) @@ -36,7 +37,6 @@ 5 "Ignore rmail errors from this file, you don't have rmail"))) (require 'nnmail) (require 'nnoo) -(eval-when-compile (require 'cl)) (nnoo-declare nnbabyl) diff --git a/lisp/nndoc.el b/lisp/nndoc.el index 8cd81b1..78096e9 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -26,12 +26,12 @@ ;;; Code: +(require 'cl) (require 'nnheader) (require 'message) (require 'nnmail) (require 'nnoo) (require 'gnus-util) -(eval-when-compile (require 'cl)) (nnoo-declare nndoc) diff --git a/lisp/nneething.el b/lisp/nneething.el index 2c6fb78..4719bc8 100644 --- a/lisp/nneething.el +++ b/lisp/nneething.el @@ -26,8 +26,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'nnheader) (require 'nnmail) (require 'nnoo) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index 1b3b5a5..cfada1c 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -28,8 +28,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'mail-utils) (require 'mime) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index f8c4a66..19d1956 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -59,8 +59,8 @@ ;;; Code: -(eval-and-compile - (require 'imap)) +(require 'cl) +(eval-and-compile (require 'imap)) (require 'nnoo) (require 'nnmail) diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el index e450dec..1ce4f7c 100644 --- a/lisp/nnlistserv.el +++ b/lisp/nnlistserv.el @@ -28,8 +28,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'nnoo) (require 'nnweb) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 75c1281..c0d8259 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -25,8 +25,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'nnheader) (require 'message) (require 'custom) diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index d2d9abe..17f4d4d 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -24,12 +24,12 @@ ;;; Code: +(require 'cl) +(eval-when-compile (require 'static)) (require 'nnheader) (require 'message) (require 'nnmail) (require 'nnoo) -(eval-when-compile (require 'cl)) -(eval-when-compile (require 'static)) (nnoo-declare nnmbox) diff --git a/lisp/nnmh.el b/lisp/nnmh.el index 6ee74d7..e09a603 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -31,11 +31,11 @@ ;;; Code: +(require 'cl) (require 'nnheader) (require 'nnmail) (require 'gnus-start) (require 'nnoo) -(eval-when-compile (require 'cl)) (nnoo-declare nnmh) diff --git a/lisp/nnml.el b/lisp/nnml.el index b9b2661..d3eda68 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -30,10 +30,10 @@ ;;; Code: +(require 'cl) (require 'nnheader) (require 'nnmail) (require 'nnoo) -(eval-when-compile (require 'cl)) (nnoo-declare nnml) diff --git a/lisp/nnoo.el b/lisp/nnoo.el index 21b17c3..2543494 100644 --- a/lisp/nnoo.el +++ b/lisp/nnoo.el @@ -25,8 +25,8 @@ ;;; Code: +(require 'cl) (require 'nnheader) -(eval-when-compile (require 'cl)) (defvar nnoo-definition-alist nil) (defvar nnoo-state-alist nil) diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index 031c0ac..454fdd4 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -26,12 +26,12 @@ ;;; Code: +(require 'cl) (require 'nnheader) (require 'nnmail) (require 'gnus-soup) (require 'gnus-msg) (require 'nnoo) -(eval-when-compile (require 'cl)) (nnoo-declare nnsoup) diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 106aee0..e253376 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -26,10 +26,10 @@ ;;; Code: +(require 'cl) (require 'nnheader) (require 'nntp) (require 'nnoo) -(eval-when-compile (require 'cl)) (nnoo-declare nnspool) diff --git a/lisp/nntp.el b/lisp/nntp.el index d7fddd4..4c1e1bf 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -25,14 +25,13 @@ ;;; Code: +(require 'cl) (require 'nnheader) (require 'nnoo) (require 'gnus-util) (nnoo-declare nntp) -(eval-when-compile (require 'cl)) - (defvoo nntp-address nil "Address of the physical nntp server.") diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index fd25bf6..aab6e29 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -31,7 +31,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl) (require 'nntp) (require 'nnheader) (require 'gnus) diff --git a/lisp/nnweb.el b/lisp/nnweb.el index d46aefd..6bfc2e3 100644 --- a/lisp/nnweb.el +++ b/lisp/nnweb.el @@ -28,8 +28,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) - +(require 'cl) (require 'nnoo) (require 'message) (require 'gnus-util) diff --git a/lisp/pop3.el b/lisp/pop3.el index 41df335..8581164 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -35,6 +35,7 @@ ;;; Code: +(require 'cl) (require 'mail-utils) (defconst pop3-version "1.3s") diff --git a/lisp/smiley.el b/lisp/smiley.el index 76b2884..7f226fd 100644 --- a/lisp/smiley.el +++ b/lisp/smiley.el @@ -35,7 +35,7 @@ ;; The smilies were drawn by Joe Reiss . -(eval-when-compile (require 'cl)) +(require 'cl) (require 'annotations) (require 'messagexmas) (require 'custom) diff --git a/lisp/time-date.el b/lisp/time-date.el index c40ddbe..06277f4 100644 --- a/lisp/time-date.el +++ b/lisp/time-date.el @@ -24,6 +24,7 @@ ;;; Code: +(require 'cl) (require 'parse-time) (defun date-to-time (date) -- 1.7.10.4