aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2008-10-28 17:57:09 +0000
committerMartin Rudalics2008-10-28 17:57:09 +0000
commitefe0da9c0ef4f35a75438424b20351f608df03fd (patch)
tree767c278362232237f2e6e8fb1077c08f22fa8ebf
parent23fe745a73768849ffb52fdd24e78ba245ac12d0 (diff)
downloademacs-efe0da9c0ef4f35a75438424b20351f608df03fd.tar.gz
emacs-efe0da9c0ef4f35a75438424b20351f608df03fd.zip
(vc-cvs-stay-local): Fix typo in choice.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-cvs.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 461a8495024..edf17db7b17 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-10-28 Martin Rudalics <rudalics@gmx.at>
2
3 * vc-cvs.el (vc-cvs-stay-local): Fix typo in choice.
4
12008-10-28 Phil Sung <psung@mit.edu> (tiny change) 52008-10-28 Phil Sung <psung@mit.edu> (tiny change)
2 6
3 * follow.el (follow-scroll-down, follow-calc-win-end) 7 * follow.el (follow-scroll-down, follow-calc-win-end)
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 7a38ff11f93..81db5a08576 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -121,7 +121,7 @@ can be a list of regular expressions where the first element is the
121symbol `except'; then VC always stays local except for hosts matched 121symbol `except'; then VC always stays local except for hosts matched
122by these regular expressions." 122by these regular expressions."
123 :type '(choice (const :tag "Always stay local" t) 123 :type '(choice (const :tag "Always stay local" t)
124 (const :tag "Only for file operations" 'only-file) 124 (const :tag "Only for file operations" only-file)
125 (const :tag "Don't stay local" nil) 125 (const :tag "Don't stay local" nil)
126 (list :format "\nExamine hostname and %v" :tag "Examine hostname ..." 126 (list :format "\nExamine hostname and %v" :tag "Examine hostname ..."
127 (set :format "%v" :inline t (const :format "%t" :tag "don't" except)) 127 (set :format "%v" :inline t (const :format "%t" :tag "don't" except))
@@ -969,7 +969,7 @@ state."
969 ;; "-f" "-n" "update" "-d" "-P") 969 ;; "-f" "-n" "update" "-d" "-P")
970 (vc-exec-after 970 (vc-exec-after
971 `(vc-cvs-after-dir-status (quote ,update-function)))))) 971 `(vc-cvs-after-dir-status (quote ,update-function))))))
972 972
973(defun vc-cvs-dir-status-files (dir files default-state update-function) 973(defun vc-cvs-dir-status-files (dir files default-state update-function)
974 "Create a list of conses (file . state) for DIR." 974 "Create a list of conses (file . state) for DIR."
975 (apply 'vc-cvs-command (current-buffer) 'async dir "-f" "status" files) 975 (apply 'vc-cvs-command (current-buffer) 'async dir "-f" "status" files)