Synch with emacs-w3m.

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

diff --git a/ChangeLog b/ChangeLog
index 463739b..67929cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
+       * lisp/dgnushack.el (dgnushack-bind-colon-keywords): Protect
+       against unexpected data structure.
+
+2002-10-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
        * lisp/nnshimbun.el: Clean up codes.
        (nnshimbun-buffer, nnshimbun-current-directory)
        (nnshimbun-current-group, nnshimbun-server-directory): Removed.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 4cccaae..67f7510 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))