From 28e18bfb65e78435df7f26248c560c1f28b529dc Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sat, 17 Dec 2005 17:14:51 +0000
Subject: [PATCH] Release Emacs Muse 3.02.5.

* NEWS: Add items for 3.02.5 release.

* muse.el: Release Muse 3.02.5.
git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-36
---
 ChangeLog        | 16 ++++++++++++++++
 Makefile.defs    |  4 ++--
 NEWS             | 38 ++++++++++++++++++++++++++++++++++++++
 debian/changelog |  6 ++++++
 lisp/muse.el     |  8 ++++----
 muse.texi        |  2 +-
 6 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1291f68..717752e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,22 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02
 #
 
+2005-12-17 17:14:51 GMT	Michael Olson <mwolson@gnu.org>	patch-36
+
+    Summary:
+      Release Emacs Muse 3.02.5.
+    Revision:
+      muse--rel--3.02--patch-36
+
+    * NEWS: Add items for 3.02.5 release.
+    
+    * muse.el: Release Muse 3.02.5.
+
+    modified files:
+     ChangeLog Makefile.defs NEWS debian/changelog lisp/muse.el
+     muse.texi
+
+
 2005-12-17 02:08:46 GMT	Michael Olson <mwolson@gnu.org>	patch-35
 
     Summary:
diff --git a/Makefile.defs b/Makefile.defs
index 1788e0e..75d8456 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.02
-LASTUPLOAD = 3.02.01-1
+VERSION    = 3.02.5
+LASTUPLOAD = 3.02.02-1
 BUILDOPTS  =
diff --git a/NEWS b/NEWS
index f5662f0..9fb51ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,43 @@
 Emacs Muse NEWS --- History of user-visible changes    -*- outline -*-
 
+* Changes in Muse 3.02.5
+
+** LaTeX
+
+*** Use a better algorithm for determining how many times we need to
+call pdflatex for publishing.  Anything with a Table of Contents needs
+2 passes.
+
+** Muse Mode
+
+*** The 3 levels of emphasis now have corresponding muse-emphasis-N faces.
+This permits the user to customize them, which may be useful if a font
+does not have italic and/or bold versions.
+
+*** Visiting pages with anchors works better.
+
+*** Fix fill bug with semicolons in the middle of paragraphs.
+
+*** Fix a bug with editing the link at point.
+
+*** Fix a display bug with text like =<verbatim><example></verbatim>=.
+
+** Project settings
+
+*** Fix an edge case that yielded a stringp: nil error.
+
+*** Prevent auto-save files from being recognized as Muse files.
+
+** Wiki
+
+*** By default, WikiWords can have consecutive capital letters.
+
+*** Fix an error that occurs when muse-colors is not loaded.
+
+*** It is now possible to specify a suffix for WikiWord links.
+For example: WikiName''''s.  The WikiName part will be displayed and
+colored as a link, but the "s" will be left alone.
+
 * Changes in Muse 3.02.02
 
 ** Configuration
diff --git a/debian/changelog b/debian/changelog
index 33d656f..dd739ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+muse-el (3.02.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Sat, 17 Dec 2005 12:11:27 -0500
+
 muse-el (3.02.02-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/lisp/muse.el b/lisp/muse.el
index 6d29546..3186f76 100644
--- a/lisp/muse.el
+++ b/lisp/muse.el
@@ -4,14 +4,14 @@
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: muse.el
-;; Version: 3.02.02
-;; Date: Sat 19-Nov-2005
+;; Version: 3.02.5
+;; Date: Sat 17-Dec-2005
 ;; Keywords: hypermedia
 ;; Author: John Wiegley (johnw AT gnu DOT org)
 ;; Maintainer: Michael Olson (mwolson AT gnu DOT org)
 ;; Description: An authoring and publishing tool for Emacs
 ;; URL: http://www.mwolson.org/projects/MuseMode.html
-;; Compatibility: Emacs21
+;; Compatibility: Emacs21 XEmacs21 Emacs22
 
 ;; This file is not part of GNU Emacs.
 
@@ -45,7 +45,7 @@
 
 ;;; Code:
 
-(defvar muse-version "3.02.02"
+(defvar muse-version "3.02.5"
   "The version of Muse currently loaded")
 
 (defun muse-version (&optional insert)
diff --git a/muse.texi b/muse.texi
index bfd2f26..646904a 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.02.
+This manual is for the Emacs Muse version 3.02.5.
 
 Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
-- 
2.11.4.GIT