From 4bf218b3f8fd70ae7ccb25fb468605813051a1e9 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Tue, 10 Oct 2006 18:22:13 +0000 Subject: [PATCH] Port Emacs22 bug fix from muse--main--0 and release as 3.02.7 * lisp/muse-colors.el (muse-use-font-lock): Don't quote beginning-of-line. This should fix a bug that was noticed in recent Emacs 22 builds. * lisp/muse.el (muse-version): Release Emacs Muse 3.02.7. git-archimport-id: mwolson@gnu.org--2005/muse--rel--3.02--patch-61 --- ChangeLog | 18 ++++++++++++++++++ Makefile.defs | 4 ++-- lisp/muse-colors.el | 2 +- lisp/muse.el | 2 +- muse.texi | 2 +- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e70636..856756b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,24 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--rel--3.02 # +2006-10-10 18:22:13 GMT Michael Olson patch-61 + + Summary: + Port Emacs22 bug fix from muse--main--0 and release as 3.02.7 + Revision: + muse--rel--3.02--patch-61 + + * lisp/muse-colors.el (muse-use-font-lock): Don't quote + beginning-of-line. This should fix a bug that was noticed in recent + Emacs 22 builds. + + * lisp/muse.el (muse-version): Release Emacs Muse 3.02.7. + + modified files: + ChangeLog Makefile.defs lisp/muse-colors.el lisp/muse.el + muse.texi + + 2006-10-10 18:16:10 GMT Michael Olson patch-60 Summary: diff --git a/Makefile.defs b/Makefile.defs index 81910a3..7583319 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.6b -LASTUPLOAD = 3.02.6-1 +VERSION = 3.02.7 +LASTUPLOAD = 3.02.6-2 BUILDOPTS = diff --git a/lisp/muse-colors.el b/lisp/muse-colors.el index 5c26e95..9f40cd5 100644 --- a/lisp/muse-colors.el +++ b/lisp/muse-colors.el @@ -404,7 +404,7 @@ affect the match data results." (muse-add-to-invisibility-spec 'muse) (set (make-local-variable 'font-lock-multiline) 'undecided) (set (make-local-variable 'font-lock-defaults) - `(nil t nil nil 'beginning-of-line + `(nil t nil nil beginning-of-line (font-lock-fontify-region-function . muse-colors-region) (font-lock-unfontify-region-function . muse-unhighlight-region))) diff --git a/lisp/muse.el b/lisp/muse.el index 1af7c94..f49bdb9 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -45,7 +45,7 @@ ;;; Code: -(defvar muse-version "3.02.6" +(defvar muse-version "3.02.7" "The version of Muse currently loaded") (defun muse-version (&optional insert) diff --git a/muse.texi b/muse.texi index f432fec..ecdb950 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.6. +This manual is for the Emacs Muse version 3.02.7. Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc. -- 2.11.4.GIT