From 27ce863dcd3dc73b22548dcd76b4f1ccae3bb9bf Mon Sep 17 00:00:00 2001 From: "Michael W. Olson" Date: Sat, 18 Aug 2007 23:59:44 -0400 Subject: [PATCH] Emacs21 fixes * lisp/muse-publish.el (muse-publish-include-tag): Switch from copy-tree to copy-alist, since Emacs21 does not have the former, and the latter does what we want. * lisp/muse.el: Force-require 'derived, since Emacs21 does not have derived-mode-p in subr.el like Emacs22 does. --- ChangeLog | 7 +++++++ lisp/muse-publish.el | 2 +- lisp/muse.el | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac4ed25..1d83e47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ * AUTHORS: Update. + * lisp/muse-publish.el (muse-publish-include-tag): Switch from + copy-tree to copy-alist, since Emacs21 does not have the former, + and the latter does what we want. + + * lisp/muse.el: Force-require 'derived, since Emacs21 does not + have derived-mode-p in subr.el like Emacs22 does. + 2007-08-17 Michael Olson * etc/muse.rnc: Add the tag. diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el index e822f7d..cabce6f 100644 --- a/lisp/muse-publish.el +++ b/lisp/muse-publish.el @@ -2006,7 +2006,7 @@ The `markup' attribute controls how this file is marked up after being inserted. See `muse-publish-markup-attribute' for an explanation of how it works." (let ((filename (muse-publish-get-and-delete-attr "file" attrs)) - (muse-publishing-directives (copy-tree muse-publishing-directives))) + (muse-publishing-directives (copy-alist muse-publishing-directives))) (if filename (setq filename (expand-file-name filename diff --git a/lisp/muse.el b/lisp/muse.el index 471e788..0555335 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -69,6 +69,9 @@ familiar with Emacs." (provide 'muse) +(condition-case nil + (require 'derived) + (error nil)) (require 'wid-edit) (require 'muse-regexps) -- 2.11.4.GIT