aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-08-09 15:50:49 +0800
committerChong Yidong2012-08-09 15:50:49 +0800
commitc7fe9adcd4c114443f3706d7150ff5ce632f8717 (patch)
tree8012b4bdfafa3aab68bee47be4b1b764df10488a
parenta9f5a6491c6b3deead2975bfe4da583568a0167a (diff)
downloademacs-c7fe9adcd4c114443f3706d7150ff5ce632f8717.tar.gz
emacs-c7fe9adcd4c114443f3706d7150ff5ce632f8717.zip
Update docstrings for last change.
-rw-r--r--lisp/vc/log-view.el28
1 files changed, 16 insertions, 12 deletions
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 0f21437419c..9dda78d0314 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -537,12 +537,14 @@ It assumes that a log entry starts with a line matching
537 537
538(defun log-view-diff (beg end) 538(defun log-view-diff (beg end)
539 "Get the diff between two revisions. 539 "Get the diff between two revisions.
540If the mark is not active or the mark is on the revision at point, 540If the region is inactive or the mark is on the revision at
541get the diff between the revision at point and its previous revision. 541point, get the diff between the revision at point and its
542Otherwise, get the diff between the revisions where the region starts 542previous revision. Otherwise, get the diff between the revisions
543and ends. 543where the region starts and ends.
544Contrary to `log-view-diff-changeset', it will only show the part of the 544
545changeset that affected the currently considered file(s)." 545Unlike `log-view-diff-changeset', this function only shows the
546part of the changeset which affected the currently considered
547file(s)."
546 (interactive 548 (interactive
547 (list (if (use-region-p) (region-beginning) (point)) 549 (list (if (use-region-p) (region-beginning) (point))
548 (if (use-region-p) (region-end) (point)))) 550 (if (use-region-p) (region-end) (point))))
@@ -562,12 +564,14 @@ changeset that affected the currently considered file(s)."
562 564
563(defun log-view-diff-changeset (beg end) 565(defun log-view-diff-changeset (beg end)
564 "Get the diff between two revisions. 566 "Get the diff between two revisions.
565If the mark is not active or the mark is on the revision at point, 567If the region is inactive or the mark is on the revision at
566get the diff between the revision at point and its previous revision. 568point, get the diff between the revision at point and its
567Otherwise, get the diff between the revisions where the region starts 569previous revision. Otherwise, get the diff between the revisions
568and ends. 570where the region starts and ends.
569Contrary to `log-view-diff', it will show the whole changeset including 571
570the changes that affected other files than the currently considered file(s)." 572Unlike `log-view-diff' this function shows the whole changeset,
573including changes affecting other files than the currently
574considered file(s)."
571 (interactive 575 (interactive
572 (list (if (use-region-p) (region-beginning) (point)) 576 (list (if (use-region-p) (region-beginning) (point))
573 (if (use-region-p) (region-end) (point)))) 577 (if (use-region-p) (region-end) (point))))