(log-view-minor-wrap): First rev is the one at point.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c84d5c6ce826c7ce81bed447694143f16feb676f..f55d4155a28667f16ccf40a804aaefda435cbb81 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,10 @@
 2006-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * log-view.el (log-view-minor-wrap): First rev is the one at point.
+
        * calendar/cal-menu.el: Avoid macros from calendar.el so as to break
        the nastiest part of the cyclic dependency.
-       (cal-menu-update): Use dotimes.
-       (cal-menu-update): Use calendar-increment-month.
+       (cal-menu-update): Use dotimes and calendar-increment-month.
 
        * calendar/calendar.el: Remove unnecessary leading stars in docstrings.
        (calendar-week-start-day): Add an :initializer.

diff --git a/lisp/log-view.el b/lisp/log-view.el
index 91320f08dd9abb718484626fae667ef0f35e1555..e7a58dad8b7b2938d05056381f050d9f7332627a 100644 (file)
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,7 +1,7 @@
 ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;           Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: rcs sccs cvs log version-control
@@ -225,8 +225,8 @@
 
 (defun log-view-minor-wrap (buf f)
   (let ((data (with-current-buffer buf
-               (let* ((beg (if mark-active (region-beginning) (point)))
-                      (end (if mark-active (region-end) (point)))
+               (let* ((beg (point))
+                      (end (if mark-active (mark) (point)))
                       (fr (log-view-current-tag beg))
                       (to (log-view-current-tag end)))
                  (when (string-equal fr to)
@@ -235,8 +235,11 @@
                      (log-view-msg-next)
                      (setq to (log-view-current-tag))))
                  (cons
-                  (cons (log-view-current-file) to)
-                  (cons (log-view-current-file) fr))))))
+                   ;; The first revision has to be the one at point, for
+                   ;; operations that only take one revision
+                   ;; (e.g. cvs-mode-edit).
+                  (cons (log-view-current-file) fr)
+                  (cons (log-view-current-file) to))))))
     (let ((cvs-branch-prefix (cdar data))
          (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
          (cvs-minor-current-files