mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(diff-font-lock-keywords): Fix M. Kifer's last change differently.

Browse source
This commit is contained in:
Stefan Monnier 2007-06-22 21:18:31 +00:00
parent 2ef3b3fe29
commit d8e4eadf9b
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2007-06-22 Stefan Monnier <monnier@iro.umontreal.ca>
* diff-mode.el (diff-font-lock-keywords): Fix M. Kifer's last change
differently.
* vc-hg.el (vc-hg-registered): Add an autoloaded version.
(vc-hg-log-view-mode): Use log-view-font-lock-keywords.
@ -92,6 +95,26 @@
2007-06-20 Stefan Monnier <monnier@iro.umontreal.ca>
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
buffer-local value of log-view-*-re if applicable.
* vc-bzr.el (vc-bzr-dir-state): Use setq rather than set.
Use vc-bzr-command rather than the ill defined vc-bzr-command*.
(vc-bzr-command*): Remove both (incompatible) versions.
(vc-bzr-do-command*): Remove.
(vc-bzr-with-process-environment, vc-bzr-std-process-invocation):
Remove by folding into its only caller vc-bzr-command.
(vc-bzr-command): Always set the environment, even when ineffective.
(vc-bzr-version): Minor fix up.
(vc-bzr-admin-dirname): New var.
(vc-bzr-bzr-dir): Remove.
(vc-bzr-root-dir): New fun.
(vc-bzr-registered): Use it. Add an autoloaded version.
(vc-bzr-responsible-p): Use vc-bzr-root-dir as well.
(vc-bzr-view-log-function): Remove.
(vc-bzr-log-view-mode): New major mode to replace it.
(vc-bzr-print-log): Only activate the old hack if needed.
* vc.el (vc-default-log-view-mode): New function.
(vc-print-log): Add new `log-view-mode' VC operation.

2
lisp/diff-mode.el
View file

@ -338,7 +338,7 @@ when editing big diffs)."
("^--- .+ ----$" . diff-hunk-header-face) ;context
("^[0-9,]+[acd][0-9,]+$" . diff-hunk-header-face) ;normal
("^---$" . diff-hunk-header-face) ;normal
("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^ \t]+\\)\\(.*[^*-]\\)?\n"
("^\\(---\\|\\+\\+\\+\\|\\*\\*\\*\\) \\([^\t\n]+\\)\\(.*[^*-]\\)?\n"
(0 diff-header-face) (2 diff-file-header-face prepend))
("^\\([-<]\\)\\(.*\n\\)"
(1 diff-indicator-removed-face) (2 diff-removed-face))