CVS update by scop packages/unsupported/scop/vc ...
User: scop
Date: 06/04/22 20:27:49
Modified: packages/unsupported/scop/vc ChangeLog vc.el
Log:
Use only 1 arg to goto-line, fixes error when annotating.
Revision Changes Path
1.45 +6 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- ChangeLog 2006/04/20 21:35:32 1.44
+++ ChangeLog 2006/04/22 18:27:48 1.45
＠＠ -1,3 +1,9 ＠＠
+2006-04-22 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc.el (vc-annotate): `goto-line' in XEmacs takes only 1 arg,
+ emulate GNU Emacs' 2-arg one.
+ (vc-annotate-warp-version): Ditto.
+
2006-04-21 Ville Skyttä <scop(a)xemacs.org>
* Makefile (VERSION): 0.02.
1.25 +10 -2 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- vc.el 2006/04/16 14:19:45 1.24
+++ vc.el 2006/04/22 18:27:48 1.25
＠＠ -3152,7 +3152,11 ＠＠ colors. `vc-annotate-background' specifi
(set (make-local-variable 'vc-annotate-parent-display-mode)
display-mode)))
(when current-line
- (goto-line current-line temp-buffer-name))
+ ;; XEmacs change: our goto-line groks only 1 arg
+ (let ((window (get-buffer-window temp-buffer-name)))
+ (if window (select-window window)
+ (switch-to-buffer-other-window temp-buffer-name)))
+ (goto-line current-line))
(message "Annotating... done")))
(defun vc-annotate-prev-version (prefix)
＠＠ -3278,10 +3282,14 ＠＠ revision."
(vc-annotate vc-annotate-parent-file newrev
vc-annotate-parent-display-mode
buf)
+ ;; XEmacs change: our goto-line groks only 1 arg
+ (let ((window (get-buffer-window buf)))
+ (if window (select-window window)
+ (switch-to-buffer-other-window buf)))
(goto-line (min oldline (progn (goto-char (point-max))
;; XEmacs: previous-line needs 1 arg
(previous-line 1)
- (line-number-at-pos))) buf)))))
+ (line-number-at-pos))))))))
(defun vc-annotate-compcar (threshold a-list)
"Test successive cons cells of A-LIST against THRESHOLD.