User: scop
Date: 06/05/01 00:43:03
Modified: packages/unsupported/scop/vc ChangeLog vc.el
Log:
Cope without log-view.el.
Revision Changes Path
1.49 +5 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ChangeLog 2006/04/29 19:27:39 1.48
+++ ChangeLog 2006/04/30 22:43:01 1.49
@@ -1,3 +1,8 @@
+2006-05-01 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc.el (vc-default-show-log-entry): Workaround for (at least so
+ far) missing log-view stuff.
+
2006-04-29 Ville Skyttä <scop(a)xemacs.org>
* vc.el (vc-annotate-warp-version): Use `forward-line' instead
1.27 +8 -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.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- vc.el 2006/04/29 19:27:39 1.26
+++ vc.el 2006/04/30 22:43:01 1.27
@@ -2435,7 +2435,7 @@ If FOCUS-REV is non-nil, leave the point
(vc-call print-log file)
(set-buffer "*vc*"))))
(pop-to-buffer (current-buffer))
- ;; XEmacs: we don't have log-view-mode... maybe, yet! -> ignore-errors
+ ;; XEmacs: we don't have log-view-mode (yet?), so use ignore-errors here
(ignore-errors (log-view-mode))
(vc-exec-after
`(let ((inhibit-read-only t))
@@ -2455,7 +2455,13 @@ If FOCUS-REV is non-nil, leave the point
(defun vc-default-show-log-entry (backend rev)
(with-no-warnings
- (log-view-goto-rev rev)))
+ ;; XEmacs: we don't have log-view-mode (yet?), so let's try at least
+ ;; something that could work for CVS and Subversion until it is.
+ (if (fboundp 'log-view-goto-rev)
+ (log-view-goto-rev rev)
+ (and (re-search-forward (concat "^r\\(evision \\)?" (regexp-quote rev)
+ "\\(\\s-+\\|$\\)") nil t)
+ (beginning-of-line)))))
(defun vc-default-comment-history (backend file)
"Return a string with all log entries stored in BACKEND for FILE."
Show replies by date