[Emacs-diffs] /srv/bzr/emacs/trunk r109530: * lisp/vc/log-view.el (log-view-diff): Use use-region-p.

[Chong Yidong]

------------------------------------------------------------
revno: 109530
fixes bug: http://debbugs.gnu.org/10133
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-09 15:45:23 +0800
message:
  * lisp/vc/log-view.el (log-view-diff): Use use-region-p.
  (log-view-diff-changeset, log-view-minor-wrap): Likewise.
modified:
  lisp/ChangeLog
  lisp/vc/log-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-09 07:34:53 +0000
+++ b/lisp/ChangeLog    2012-08-09 07:45:23 +0000
@@ -1,5 +1,8 @@
 2012-08-09  Chong Yidong  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/vc/log-view.el'
--- a/lisp/vc/log-view.el       2012-07-11 04:35:13 +0000
+++ b/lisp/vc/log-view.el       2012-08-09 07:45:23 +0000
@@ -452,7 +452,7 @@
 (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 @@
 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 @@
 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))