diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-06-22 21:18:31 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-06-22 21:18:31 +0000 |
| commit | d8e4eadf9ba37eed47de1bb694b56ff25b2d4e59 (patch) | |
| tree | 6d406fc5358ee895eafe60e7fe97c41280fb3e69 | |
| parent | 2ef3b3fe29833531e057ffc74fb586f0e50c1ca5 (diff) | |
| download | emacs-d8e4eadf9ba37eed47de1bb694b56ff25b2d4e59.tar.gz | |
(diff-font-lock-keywords): Fix M. Kifer's last change differently.
| -rw-r--r-- | lisp/ChangeLog | 23 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c347187cad5..445cd41d70e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 973e387f230..64199147c21 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -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)) |