From b2c446fde5ff52bc17f186f82ea4d2607d379290 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Fri, 8 Jul 2005 21:59:41 +0000 Subject: [PATCH] Try to fix an error with `muse-blosxom-get-categories'. * lisp/muse-blosxom.el (muse-blosxom-get-categories): Be extra cautious about processing directories. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-108 --- ChangeLog | 14 ++++++++++++++ examples/johnw/publish-johnw | 0 lisp/muse-blosxom.el | 20 +++++++++++--------- 3 files changed, 25 insertions(+), 9 deletions(-) mode change 100644 => 100755 examples/johnw/publish-johnw diff --git a/ChangeLog b/ChangeLog index cd9ee28..8d08267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,20 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-07-08 21:59:41 GMT Michael Olson patch-108 + + Summary: + Try to fix an error with `muse-blosxom-get-categories'. + Revision: + muse--main--1.0--patch-108 + + * lisp/muse-blosxom.el (muse-blosxom-get-categories): Be extra cautious + about processing directories. + + modified files: + ChangeLog examples/johnw/publish-johnw lisp/muse-blosxom.el + + 2005-07-08 21:11:53 GMT Michael Olson patch-107 Summary: diff --git a/examples/johnw/publish-johnw b/examples/johnw/publish-johnw old mode 100644 new mode 100755 diff --git a/lisp/muse-blosxom.el b/lisp/muse-blosxom.el index 52761f5..1c2ab7b 100644 --- a/lisp/muse-blosxom.el +++ b/lisp/muse-blosxom.el @@ -175,15 +175,17 @@ The base directory is specified by BASE, and defaults to Directories starting with \".\" will be ignored." (unless base (setq base muse-blosxom-base-directory)) - (let (list dir) - (dolist (file (directory-files base t "^[^.]")) - (when (file-directory-p file) ; must be a directory - (setq dir (file-name-nondirectory file)) - (push dir list) - (nconc list (mapcar #'(lambda (item) - (concat dir "/" item)) - (muse-blosxom-get-categories file))))) - list)) + (when (file-directory-p base) + (let (list dir) + (dolist (file (directory-files base t "^[^.]")) + (when (file-directory-p file) ; must be a directory + (setq dir (file-name-nondirectory file)) + (when dir + (push dir list) + (nconc list (mapcar #'(lambda (item) + (concat dir "/" item)) + (muse-blosxom-get-categories file)))))) + list))) (defun muse-blosxom-title-to-file (title) "Derive a file name from the given TITLE. -- 2.11.4.GIT