Synch with emacs-w3m.

* dgnushack.el (dgnushack-bind-colon-keywords): Protect against unexpected
 data structure.

diff --git a/ChangeLog b/ChangeLog
index 160ccb9..fcc3ca2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+       * lisp/dgnushack.el (dgnushack-bind-colon-keywords): Protect
+       against unexpected data structure.
+
 2002-10-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-vers.el (gnus-revision-number): Increment to 02.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index e3b3e53..e058281 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -347,7 +347,8 @@ Try to re-configure with --with-addpath=FLIM_PATH and run make again.
                                     (error nil)))
                   (when (listp form)
                     (while form
-                      (setq elem (pop form))
+                      (setq elem (car-safe form)
+                            form (cdr-safe form))
                       (unless (memq (car-safe elem)
                                     '(defcustom defface defgroup
                                       define-widget quote))