From 20a5c05e04f3188fd1c6c8512645357c9c0d04d7 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Mon, 26 Sep 2005 22:31:57 +0000 Subject: [PATCH] Release Emacs Muse 3.02.01. * NEWS: Update entries for Muse 3.02.01. * debian/rules: Install NEWS.Debian. * debian/NEWS: New file that contains Debian-related news items. * examples/mwolson/muse-init.el: Update with my latest changes. * examples/mwolson/templates/footer.html: Use `muse-publishing-directive'. git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-245 --- ChangeLog | 27 ++++++++++++++++++++++ Makefile.defs | 4 ++-- NEWS | 42 ++++++++++++++++++++++++++++++++++ debian/NEWS | 17 ++++++++++++++ debian/changelog | 8 +++++++ debian/rules | 1 + examples/mwolson/muse-init.el | 10 +++++--- examples/mwolson/templates/footer.html | 6 +---- lisp/muse.el | 6 ++--- muse.texi | 2 +- 10 files changed, 109 insertions(+), 14 deletions(-) create mode 100644 debian/NEWS diff --git a/ChangeLog b/ChangeLog index 7a4292a..4ecec43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,33 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0 # +2005-09-26 22:31:57 GMT Michael Olson patch-245 + + Summary: + Release Emacs Muse 3.02.01. + Revision: + muse--main--1.0--patch-245 + + * NEWS: Update entries for Muse 3.02.01. + + * debian/rules: Install NEWS.Debian. + + * debian/NEWS: New file that contains Debian-related news items. + + * examples/mwolson/muse-init.el: Update with my latest changes. + + * examples/mwolson/templates/footer.html: Use + `muse-publishing-directive'. + + new files: + debian/.arch-ids/NEWS.id debian/NEWS + + modified files: + ChangeLog Makefile.defs NEWS debian/changelog debian/rules + examples/mwolson/muse-init.el + examples/mwolson/templates/footer.html lisp/muse.el muse.texi + + 2005-09-26 21:23:49 GMT Michael Olson patch-244 Summary: diff --git a/Makefile.defs b/Makefile.defs index e4c87b7..cc5ce4f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -20,6 +20,6 @@ INSTALLINFO = install-info --info-dir=$(INFODIR) #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR) # Useful only for the maintainer -VERSION = 3.02 -LASTUPLOAD = 3.01.arch.201-4 +VERSION = 3.02.01 +LASTUPLOAD = 3.02-1 BUILDOPTS = diff --git a/NEWS b/NEWS index 8f5eea2..853eb69 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,47 @@ Emacs Muse NEWS --- History of user-visible changes -*- outline -*- +* Changes in Muse 3.02.01 + +** Configuration + +*** `muse-project-alist' -- This variable should now save customizations +to the correct form in the .emacs file. Before, it was saving an +intermediate form of the variable. + +If you have used the customize interface in the previous release of +Muse to set `muse-project-alist', please do the following to import +your settings. + + - Open your .emacs file. + - Move the point to where `muse-project-alist' is set. + - Type `M-: (setq muse-project-alist-using-customize t) RET'. + - Type `C-M-x'. + - Type `M-x customize-save-variable RET muse-project-alist RET'. + +*** `muse-project-alist' -- A bug involving the deleting of items +using Emacs21 and XEmacs21 has been fixed. + +** Muse Mode + +*** Links should no longer prevent moving the point, and help text for +links should no longer cause errors to occur. + +** Publishing + +*** If 2 or more blank lines separate list or table items, each item +will be published in a separate list or table. + +*** The #date directive is now populated by default with the last +modified time of each file, rather than the current time of day. To +use this value, add '(muse-publishing-directive "date")' +to your header or footer. + +** HTML publishing + +*** `muse-xhtml-style-sheet' -- New option that indicates the style +settings to use for XHTML documents. This may be either a filename or +a string of stylesheet settings. + * Changes in Muse 3.02 ** New modules diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..1378ad1 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,17 @@ +muse-el (3.02.01-1) unstable; urgency=low + +`muse-project-alist' -- This variable should now save customizations +to the correct form in the .emacs file. Before, it was saving an +intermediate form of the variable. + +If you have used the customize interface in the previous release of +Muse to set `muse-project-alist', please do the following to import +your settings. + + - Open your .emacs file. + - Move the point to where `muse-project-alist' is set. + - Type `M-: (setq muse-project-alist-using-customize t) RET'. + - Type `C-M-x'. + - Type `M-x customize-save-variable RET muse-project-alist RET'. + + -- Michael W. Olson (GNU address) Mon, 26 Sep 2005 17:00:46 -0500 diff --git a/debian/changelog b/debian/changelog index 5504a21..8b90910 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +muse-el (3.02.01-1) unstable; urgency=low + + * New upstream release. + * If you have used the customize interface to save `muse-project-alist', + you will need to follow the instructions in NEWS.Debian. + + -- Michael W. Olson (GNU address) Mon, 26 Sep 2005 17:00:46 -0500 + muse-el (3.02-1) unstable; urgency=medium * New upstream release. diff --git a/debian/rules b/debian/rules index 4086252..cb355d7 100755 --- a/debian/rules +++ b/debian/rules @@ -57,6 +57,7 @@ install: build # Other documentation install -m 0644 AUTHORS ${PKGDIR}${DOCDIR}/AUTHORS + install -m 0644 debian/NEWS ${PKGDIR}${DOCDIR}/NEWS.Debian install -m 0644 README ${PKGDIR}${DOCDIR}/README install -m 0644 ChangeLog ${PKGDIR}${DOCDIR}/changelog cat ChangeLog.2004 >> ${PKGDIR}${DOCDIR}/changelog diff --git a/examples/mwolson/muse-init.el b/examples/mwolson/muse-init.el index 8d7a7d6..3c63040 100644 --- a/examples/mwolson/muse-init.el +++ b/examples/mwolson/muse-init.el @@ -63,7 +63,7 @@ ("Blog" (,@(muse-project-alist-dirs "~/proj/wiki/blog") - :default "guestbook") + :default "index") ,@(muse-project-alist-styles "~/proj/wiki/blog" "~/personal-site/site/blog" @@ -89,9 +89,11 @@ ;; Wiki settings (setq muse-wiki-interwiki-alist '(("PlugWiki" . "http://plug.student-orgs.purdue.edu/plugwiki/") - ("PLUG" . "http://plug.student-orgs.purdue.edu/plugwiki/") ("TheEmacsWiki" . "http://www.emacswiki.org/cgi-bin/wiki/") - ("ArchWiki" . "http://wiki.gnuarch.org/"))) + ("ArchWiki" . "http://wiki.gnuarch.org/") + ;; abbreviations + ("CERIAS" . "http://www.cerias.purdue.edu/") + ("PLUG" . "http://plug.student-orgs.purdue.edu/plugwiki/"))) ;;; Functions @@ -187,6 +189,8 @@ If FILE is not specified, use the published version of the current file." (my-muse-project-find-file "Blog"))) (global-set-key "\C-cpn" #'(lambda () (interactive) (my-muse-project-find-file "MyNotes"))) +(global-set-key "\C-cpp" #'(lambda () (interactive) + (my-muse-project-find-file "Plans"))) (global-set-key "\C-cpr" #'(lambda () (interactive) (my-muse-project-find-file "Projects"))) (global-set-key "\C-cpw" #'(lambda () (interactive) diff --git a/examples/mwolson/templates/footer.html b/examples/mwolson/templates/footer.html index f517d50..a7bb847 100644 --- a/examples/mwolson/templates/footer.html +++ b/examples/mwolson/templates/footer.html @@ -81,11 +81,7 @@ - Updated - (format-time-string - "%Y-%m-%d" - (nth 5 (file-attributes muse-publishing-current-file))) - + Updated (muse-publishing-directive "date") diff --git a/lisp/muse.el b/lisp/muse.el index edf89af..6309d59 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -4,8 +4,8 @@ ;; Emacs Lisp Archive Entry ;; Filename: muse.el -;; Version: 3.02 -;; Date: Thu 16-Sep-2005 +;; Version: 3.02.01 +;; Date: Thu 26-Sep-2005 ;; Keywords: hypermedia ;; Author: John Wiegley (johnw AT gnu DOT org) ;; Maintainer: Michael Olson (mwolson AT gnu DOT org) @@ -45,7 +45,7 @@ ;;; Code: -(defvar muse-version "3.02" +(defvar muse-version "3.02.01" "The version of Muse currently loaded") (defun muse-version (&optional insert) diff --git a/muse.texi b/muse.texi index 1219dc3..722c812 100644 --- a/muse.texi +++ b/muse.texi @@ -12,7 +12,7 @@ @syncodeindex fn cp @copying -This manual is for the Emacs Muse version 3.02. +This manual is for the Emacs Muse version 3.02.01. Copyright (C) 2004, 2005 Free Software Foundation, Inc. -- 2.11.4.GIT