Fix.

[elisp/gnus.git-] / lisp / dgnushack.el

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 1f515ba..5ae684b 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -329,22 +329,23 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
                 (while (setq form (condition-case nil
                                       (read buffer)
                                     (error nil)))
-                  (while form
-                    (setq elem (pop form))
-                    (unless (memq (car-safe elem)
-                                  '(\` backquote
-                                    defcustom defface defgroup
-                                    define-widget quote))
-                      (while (consp elem)
-                        (push (car elem) form)
-                        (setq elem (cdr elem)))
-                      (when (and elem
-                                 (symbolp elem)
-                                 (not (eq ': elem))
-                                 (eq ?: (aref (symbol-name elem) 0))
-                                 (not (memq elem ignores))
-                                 (not (memq elem keywords)))
-                        (push elem keywords)))))))
+                  (when (listp form)
+                    (while form
+                      (setq elem (pop form))
+                      (unless (memq (car-safe elem)
+                                    '(\` backquote
+                                      defcustom defface defgroup
+                                      define-widget quote))
+                        (while (consp elem)
+                          (push (car elem) form)
+                          (setq elem (cdr elem)))
+                        (when (and elem
+                                   (symbolp elem)
+                                   (not (eq ': elem))
+                                   (eq ?: (aref (symbol-name elem) 0))
+                                   (not (memq elem ignores))
+                                   (not (memq elem keywords)))
+                          (push elem keywords))))))))
             (setq keywords (sort keywords
                                  (lambda (a b)
                                    (string-lessp (symbol-name a)
@@ -440,10 +441,10 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
              (progn (require 'shimbun) nil)
            (error '("nnshimbun.el")))
          (unless (or (condition-case code
-                         (require 'w3-forms)
+                         (require 'w3-parse)
                        (error
                         (message "No w3: %s %s retrying..." code
-                                 (locate-library "w3-forms"))
+                                 (locate-library "w3-parse"))
                         nil))
                      ;; Maybe mis-configured Makefile is used (e.g.
                      ;; configured for FSFmacs but XEmacs is running).
@@ -451,20 +452,18 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
                                        (copy-sequence load-path))))
                        (if (let ((load-path lp))
                              (condition-case nil
-                                 (require 'w3-forms)
+                                 (require 'w3-parse)
                                (error nil)))
                            ;; If success, fix `load-path' for compiling.
                            (progn
                              (setq load-path lp)
                              (message " => fixed; W3DIR=%s"
                                       (file-name-directory
-                                       (locate-library "w3-forms")))
+                                       (locate-library "w3-parse")))
                              t)
                          (message " => ignored")
                          nil)))
-           '("nnweb.el" "nnlistserv.el" "nnultimate.el"
-             "nnslashdot.el" "nnwarchive.el" "webmail.el"
-             "nnwfm.el" "nnrss.el"))
+           '("nnultimate.el" "webmail.el" "nnwfm.el"))
          (condition-case code
              (progn (require 'mh-e) nil)
            (error
@@ -481,8 +480,7 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
             (message "No bbdb: %s %s (ignored)" code (locate-library "bbdb"))
             '("gnus-bbdb.el")))
          (unless (featurep 'xemacs)
-           '("gnus-xmas.el" "gnus-picon.el" "messagexmas.el"
-             "nnheaderxm.el" "smiley.el"))
+           '("gnus-xmas.el" "messagexmas.el" "nnheaderxm.el" "smiley.el"))
          (when (or (featurep 'xemacs) (<= emacs-major-version 20))
            '("smiley-ems.el"))
          (when (and (fboundp 'base64-decode-string)