Re: [patch] add interactive browse of revisions from vc *Annotate* buffers

[Benjamin Rutt]

Andre Spiegel <address@hidden> writes:

> On Thu, 2004-01-22 at 23:06, Kim F. Storm wrote:
>
>> I just committed the new code to CVS.  This also means that there is now a
>> line-at-pos function which return the current line number.
>
> I've just changed vc.el to use line-at-pos instead of vc-current-line. 
> Thanks.

Thank you for taking care of that for me.  Could you also commit the
following bugfix to my code?  The bug showed up when you have multiple
vc-annotate buffers open; I was using `make-local-variable'
improperly; that is, it wasn't being evaluated in the buffer that
actually needed the buffer-local variable (that being the annotate
buffer).

Thanks,
Benjamin Rutt

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.364
diff -c -r1.364 vc.el
*** vc.el       22 Jan 2004 23:34:33 -0000      1.364
--- vc.el       23 Jan 2004 01:53:05 -0000
***************
*** 2816,2824 ****
  (defvar vc-annotate-parent-file nil)
  (defvar vc-annotate-parent-rev nil)
  (defvar vc-annotate-parent-display-mode nil)
- (make-local-variable 'vc-annotate-parent-file)
- (make-local-variable 'vc-annotate-parent-rev)
- (make-local-variable 'vc-annotate-parent-display-mode)
  
  (defconst vc-annotate-font-lock-keywords
    ;; The fontification is done by vc-annotate-lines instead of font-lock.
--- 2816,2821 ----
***************
*** 3038,3046 ****
                         vc-annotate-version))
      (save-excursion
        (set-buffer temp-buffer-name)
!       (setq vc-annotate-parent-file bfn)
!       (setq vc-annotate-parent-rev vc-annotate-version)
!       (setq vc-annotate-parent-display-mode vc-annotate-display-mode))
           
      ;; Don't use the temp-buffer-name until the buffer is created
      ;; (only after `with-output-to-temp-buffer'.)
--- 3035,3044 ----
                         vc-annotate-version))
      (save-excursion
        (set-buffer temp-buffer-name)
!       (set (make-local-variable 'vc-annotate-parent-file) bfn)
!       (set (make-local-variable 'vc-annotate-parent-rev) vc-annotate-version)
!       (set (make-local-variable 'vc-annotate-parent-display-mode)
!          vc-annotate-display-mode))
           
      ;; Don't use the temp-buffer-name until the buffer is created
      ;; (only after `with-output-to-temp-buffer'.)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.5619
diff -c -r1.5619 ChangeLog
*** ChangeLog   22 Jan 2004 23:37:46 -0000      1.5619
--- ChangeLog   23 Jan 2004 01:53:05 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2004-01-22  Benjamin Rutt  <address@hidden>
+ 
+       * vc.el (vc-annotate): Fix improper use of `make-local-variable'
+         at the top level of vc.el.
+ 
  2004-01-23  Andre Spiegel  <address@hidden>
  
        * vc.el (vc-current-line): Function removed.  This is now done by