From 7cb303c53006356be228d2bf9acd8042c57ba8a4 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 21 Dec 2001 02:41:51 +0000 Subject: [PATCH] * dgnushack.el (dgnushack-bind-colon-keywords): Ignore non-list forms in the top level. --- ChangeLog | 5 +++++ lisp/dgnushack.el | 33 +++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8998ce..ec47f97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-21 Katsumi Yamaoka + + * lisp/dgnushack.el (dgnushack-bind-colon-keywords): Ignore + non-list forms in the top level. + 2001-12-18 Josh Huber * ChangeLog, todo: (oops) changed buffer-file-coding-system back diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index e8a371c..ef06c7a 100644 --- 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) -- 1.7.10.4