* lisp/vc/log-view.el (log-view-diff): Use use-region-p.

(log-view-diff-changeset, log-view-minor-wrap): Likewise.

Fixes: debbugs:10133

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a25b1cc431f53cb166d4c275d4d797697bfa9b3f..533ecae39e2d832cf83268e1839155649f892d1d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-09  Chong Yidong  <cyd@gnu.org>
 
+       * vc/log-view.el (log-view-diff): Use use-region-p (Bug#10133).
+       (log-view-diff-changeset, log-view-minor-wrap): Likewise.
+
        * align.el (align-region): Delete temporary markers (Bug#10047).
        Plus some code cleanups.
 

diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 6514fbd22d767700e4bde575cb5325a1339509cb..0f21437419c69695c588154dd2df6373caffd94a 100644 (file)
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -452,7 +452,7 @@ It assumes that a log entry starts with a line matching
 (defun log-view-minor-wrap (buf f)
   (let ((data (with-current-buffer buf
                (let* ((beg (point))
-                      (end (if mark-active (mark) (point)))
+                      (end (if (use-region-p) (mark) (point)))
                       (fr (log-view-current-tag beg))
                       (to (log-view-current-tag end)))
                  (when (string-equal fr to)
@@ -544,8 +544,8 @@ and ends.
 Contrary to `log-view-diff-changeset', it will only show the part of the
 changeset that affected the currently considered file(s)."
   (interactive
-   (list (if mark-active (region-beginning) (point))
-         (if mark-active (region-end) (point))))
+   (list (if (use-region-p) (region-beginning) (point))
+         (if (use-region-p) (region-end) (point))))
   (let ((fr (log-view-current-tag beg))
         (to (log-view-current-tag end)))
     (when (string-equal fr to)
@@ -569,8 +569,8 @@ and ends.
 Contrary to `log-view-diff', it will show the whole changeset including
 the changes that affected other files than the currently considered file(s)."
   (interactive
-   (list (if mark-active (region-beginning) (point))
-         (if mark-active (region-end) (point))))
+   (list (if (use-region-p) (region-beginning) (point))
+         (if (use-region-p) (region-end) (point))))
   (when (eq (vc-call-backend log-view-vc-backend 'revision-granularity) 'file)
     (error "The %s backend does not support changeset diffs" log-view-vc-backend))
   (let ((fr (log-view-current-tag beg))