From ac51b1513dbb3c11db5e0dff4d48c4fd20d2801f Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 14 Mar 2008 16:12:31 +0000 Subject: [PATCH] (vc-bzr-print-log): Insert a file marker. Run the log for each file in the list. (vc-bzr-log-view-mode): Recognize the file marker. --- lisp/ChangeLog | 4 ++++ lisp/vc-bzr.el | 27 ++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e9cab82e94..eee071781ae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2008-03-14 Dan Nicolaescu + * vc-bzr.el (vc-bzr-print-log): Insert a file marker. Run the log + for each file in the list. + (vc-bzr-log-view-mode): Recognize the file marker. + * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Add menu entries for checkdoc and profiling. diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 8e91c5c1b4d..54a4f866949 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -375,8 +375,7 @@ EDITABLE is ignored." (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View" (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack. (require 'add-log) - ;; Don't have file markers, so use impossible regexp. - (set (make-local-variable 'log-view-file-re) "\\'\\`") + (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)") (set (make-local-variable 'log-view-message-re) "^ *-+\n *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)") (set (make-local-variable 'log-view-font-lock-keywords) @@ -392,13 +391,23 @@ EDITABLE is ignored." (defun vc-bzr-print-log (files &optional buffer) ; get buffer arg in Emacs 22 "Get bzr change log for FILES into specified BUFFER." - ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so - ;; the log display may not what the user wants - but I see no other - ;; way of getting the above regexps working. - (apply 'vc-bzr-command "log" buffer 0 files - (if (stringp vc-bzr-log-switches) - (list vc-bzr-log-switches) - vc-bzr-log-switches)) + ;; `vc-do-command' creates the buffer, but we need it before running + ;; the command. + (vc-setup-buffer buffer) + ;; If the buffer exists from a previous invocation it might be + ;; read-only. + (let ((inhibit-read-only t)) + ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so + ;; the log display may not what the user wants - but I see no other + ;; way of getting the above regexps working. + (dolist (file files) + (with-current-buffer buffer + ;; Insert the file name so that log-view.el can find it. + (insert "Working file: " file "\n")) ;; Like RCS/CVS. + (apply 'vc-bzr-command "log" buffer 0 file + (if (stringp vc-bzr-log-switches) + (list vc-bzr-log-switches) + vc-bzr-log-switches)))) ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for ;; the buffer, or at least set the regexps right. (unless (fboundp 'vc-default-log-view-mode) -- 2.39.2