Your message dated Tue, 26 Apr 2011 20:46:17 -0500
with message-id <20110427014617.GA14446@elie>
and subject line Re: git-core: git.el git-commit-file when font-lock off
has caused the Debian Bug report #577834,
regarding git-core: git.el git-commit-file when font-lock off
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
577834: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577834
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-core
Version: 1:1.7.0-1
Severity: normal
File: /usr/share/doc/git-core/contrib/emacs/git.el
If font lock is disabled, M-x git-commit-file gets an error when setting
up the log message edit buffer.
M-: (global-font-lock-mode 0)
M-x git-status
/some/git/directory
c <- on a modified file
=> Font-lock trying to use keywords before setting them up
I suppose font-lock-compile-keywords should not be used if font lock is
not enabled. I suspect font-lock-add-keywords might be the right thing
instead. It seems to work for me (the code is supposed to replace the
normal log-edit-mode keywords is it?).
--- git.el.orig 2010-04-14 11:37:38.000000000 +1000
+++ git.el 2010-04-14 11:46:15.000000000 +1000
@@ -1337,7 +1337,7 @@
(log-edit 'git-do-commit nil '((log-edit-listfun . git-log-edit-files)
(log-edit-diff-function . git-log-edit-diff)) buffer)
(log-edit 'git-do-commit nil 'git-log-edit-files buffer))
- (setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords))
+ (font-lock-add-keywords nil git-log-edit-font-lock-keywords 'set)
(setq paragraph-separate (concat (regexp-quote git-log-msg-separator) "$\\|Author: \\|Date: \\|Merge: \\|Signed-off-by: \\|\f\\|[ ]*$"))
(setq buffer-file-coding-system coding-system)
(re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t))))
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i586)
Kernel: Linux 2.6.30-1-486
Locale: LANG=en_AU, LC_CTYPE=en_AU (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-core depends on:
ii libc6 2.10.1-3 GNU C Library: Shared libraries
ii libcurl3-gnutls 7.20.0-3 Multi-protocol file transfer libra
ii libdigest-sha1-perl 2.12-1 NIST SHA-1 message digest algorith
ii liberror-perl 0.17-1 Perl module for error/exception ha
ii libexpat1 2.0.1-7 XML parsing C library - runtime li
ii perl-modules 5.10.1-11 Core Perl modules
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages git-core recommends:
ii less 436-1 pager program similar to more
ii openssh-client [ssh-client] 1:5.3p1-3 secure shell (SSH) client, for sec
ii patch 2.6-2 Apply a diff file to an original
ii rsync 3.0.7-2 fast remote file copy program (lik
Versions of packages git-core suggests:
pn git-arch <none> (no description available)
pn git-cvs <none> (no description available)
pn git-daemon-run <none> (no description available)
ii git-doc 1:1.7.0-1 fast, scalable, distributed revisi
pn git-email <none> (no description available)
pn git-gui <none> (no description available)
pn git-svn <none> (no description available)
pn gitk <none> (no description available)
pn gitweb <none> (no description available)
-- no debconf information
--- End Message ---
--- Begin Message ---
Version: 1:1.7.5~rc3-1
Kevin Ryde wrote:
> If font lock is disabled, M-x git-commit-file gets an error when setting
> up the log message edit buffer.
v1.7.5-rc1~9 (git.el: Don't use font-lock-compile-keywords,
2011-02-04) should fix this. Thanks again for making it happen.
--- End Message ---
