aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2005-12-14 10:20:03 +0000
committerJuri Linkov2005-12-14 10:20:03 +0000
commite8171d36a31b88d9840a4bf36d6c7e5cbabaac60 (patch)
tree53a1724c2a9b02009cb56689bb31ea866d84bf44
parentfa81f0107f8aa59f0e41aa24a295ee8abaadd3e7 (diff)
downloademacs-e8171d36a31b88d9840a4bf36d6c7e5cbabaac60.tar.gz
emacs-e8171d36a31b88d9840a4bf36d6c7e5cbabaac60.zip
(log-view-diff): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/log-view.el9
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0843dab7a13..84ecda11885 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12005-12-14 Juri Linkov <juri@jurta.org> 12005-12-14 Juri Linkov <juri@jurta.org>
2 2
3 * log-view.el (log-view-diff): Doc fix.
4
3 * isearch.el (isearch-query-replace): Use (mark) instead of 5 * isearch.el (isearch-query-replace): Use (mark) instead of
4 isearch-opoint if mark is active in transient-mark-mode. 6 isearch-opoint if mark is active in transient-mark-mode.
5 7
diff --git a/lisp/log-view.el b/lisp/log-view.el
index d640eac3835..6a9464005fb 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -195,10 +195,11 @@
195;; 195;;
196 196
197(defun log-view-diff (beg end) 197(defun log-view-diff (beg end)
198 "Get the diff for several revisions. 198 "Get the diff between two revisions.
199If the point is the same as the mark or the mark is not active, 199If the mark is not active or the mark is on the revision at point,
200get the diff for this revision. Otherwise, get the diff between 200get the diff between the revision at point and its previous revision.
201the revisions where the region starts and ends." 201Otherwise, get the diff between the revisions where the region starts
202and ends."
202 (interactive 203 (interactive
203 (list (if mark-active (region-beginning) (point)) 204 (list (if mark-active (region-beginning) (point))
204 (if mark-active (region-end) (point)))) 205 (if mark-active (region-end) (point))))