aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReuben Thomas2011-08-30 10:40:51 -0400
committerStefan Monnier2011-08-30 10:40:51 -0400
commit5664fa7b04471a6d6d8ace7447e7b88377382ea1 (patch)
treea2af8b24ae3d83c1cdfef5dbed3c4dd1b83e288a
parent393aa9d403dda96b2fa061311cc76bbad40489cf (diff)
downloademacs-5664fa7b04471a6d6d8ace7447e7b88377382ea1.tar.gz
emacs-5664fa7b04471a6d6d8ace7447e7b88377382ea1.zip
* lisp/vc/pcvs-defs.el (cvs-find-file-and-jump): Typo in docstring.
Fixes: debbugs:9369
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/vc/pcvs-defs.el2
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15296e09b46..d9fe242e9b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-08-30 Reuben Thomas <rrt@sc3d.org> (tiny change)
2
3 * vc/pcvs-defs.el (cvs-find-file-and-jump): Typo in docstring (bug#9369).
4
12011-08-29 Juri Linkov <juri@jurta.org> 52011-08-29 Juri Linkov <juri@jurta.org>
2 6
3 * isearch.el (isearch-done): Don't display message "Mark saved" 7 * isearch.el (isearch-done): Don't display message "Mark saved"
@@ -134,8 +138,8 @@
134 138
1352011-08-24 Chong Yidong <cyd@stupidchicken.com> 1392011-08-24 Chong Yidong <cyd@stupidchicken.com>
136 140
137 * window.el (quit-window): Renamed from quit-restore-window. Use 141 * window.el (quit-window): Rename from quit-restore-window.
138 same arglist as old quit-window. 142 Use same arglist as old quit-window.
139 (frame-auto-delete): Doc fix. 143 (frame-auto-delete): Doc fix.
140 144
141 * view.el (view-mode-exit): Use quit-window. 145 * view.el (view-mode-exit): Use quit-window.
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 67f86dd364c..46b95130ca0 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -183,7 +183,7 @@ If set to nil, `cvs-mode-add' will always prompt for a message."
183 183
184(defcustom cvs-find-file-and-jump nil 184(defcustom cvs-find-file-and-jump nil
185 "Jump to the modified area when finding a file. 185 "Jump to the modified area when finding a file.
186If non-nil, `cvs-mode-file-file' will place the cursor at the beginning of 186If non-nil, `cvs-mode-find-file' will place the cursor at the beginning of
187the modified area. If the file is not locally modified, this will obviously 187the modified area. If the file is not locally modified, this will obviously
188have no effect." 188have no effect."
189 :group 'pcl-cvs 189 :group 'pcl-cvs