From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 5 May 2008 06:12:33 +0000 (+0000)
Subject: (vc-dir-mark-buffer-changed): Fix typo
X-Git-Tag: emacs-pretest-23.0.90~5816
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6494957aaac593338de005e914c9eed4faded1c1;p=emacs.git

(vc-dir-mark-buffer-changed): Fix typo
client-mode -> vc-client-object, and guess `funcall' was meant.
(vc-dir-mode): Rename client-mode -> vc-client.mode.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6dd0734e16..16a77bc3e21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo
+	client-mode -> vc-client-object, and guess `funcall' was meant.
+	(vc-dir-mode): Rename client-mode -> vc-client.mode.
+
 2008-05-05  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* net/zeroconf.el (dbus-call-method, dbus-register-signal)
@@ -5,10 +11,9 @@
 
 2008-05-04  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
-	* proced.el (proced-command-alist): Fix system-type values.  Fix
-	defcustom.
-	(proced-sorting-schemes-alist, proced-sorting-scheme): New
-	variables.
+	* proced.el (proced-command-alist): Fix system-type values.
+	Fix defcustom.
+	(proced-sorting-schemes-alist, proced-sorting-scheme): New variables.
 	(proced-sort-pcpu, proced-sort-pmem, proced-sort-pid)
 	(proced-sort-start, proced-sort, proced-sort-time): New commands.
 	(proced-update): Use proced-sorting-scheme.  Update modeline.
@@ -19,8 +24,7 @@
 
 	* vc.el: Require dired when compiling.
 
-	* minibuffer.el (completion--insert-strings): Don't delete past
-	bol.
+	* minibuffer.el (completion--insert-strings): Don't delete past bol.
 
 2008-05-03  Glenn Morris  <rgm@gnu.org>
 
@@ -43,11 +47,11 @@
 2008-05-03  Eric S. Raymond  <esr@snark.thyrsus.com>
 
 	* vc-dispatcher.el: New file, separates out the UI and command
-	execution machinery from VCS-specific logic left in vc.el.  The
-	separation is not yet completely clean, but it's a good start.
-	* vc.el: This file is about 1700 lines shorter now.  Obsolete
-	logentry-check is removed from the backend API.
-	* vc-sccs.el: Obsolete vc-sccs-logentry-check removed.  This was
+	execution machinery from VCS-specific logic left in vc.el.
+	The separation is not yet completely clean, but it's a good start.
+	* vc.el: This file is about 1700 lines shorter now.
+	Remove obsolete logentry-check from the backend API.
+	* vc-sccs.el (vc-sccs-logentry-check): Remove .  This was
 	was the only implementation of the logentry-check method, and
 	it guarded against a log length limit that has probably been
 	obsolete for 15 years (!).
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 6b08469db97..584eb8091a2 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -1546,10 +1546,12 @@ that share the same state."
 	    (when (eq t (compare-strings file nil (length ddir) ddir nil nil))
 	      (let*
 		  ((file-short (substring file (length ddir)))
-		   (state 
-		    (apply (client-mode->file-to-state client-mode) fname))
+		   (state
+		    (funcall (vc-client-object->file-to-state vc-client-mode)
+                             fname))
 		   (extra
-		    (apply (client-mode->file-to-extra client-mode) fname))
+		    (funcall (vc-client-object->file-to-extra vc-client-mode)
+                             fname))
 		   (entry
 		    (list file-short state extra)))
 		(vc-dir-update (list entry) status-buf))))))
@@ -1583,7 +1585,7 @@ U - if the cursor is on a file: unmark all the files with the same VC state
   (setq buffer-read-only t)
   (use-local-map vc-dir-mode-map)
   (set (make-local-variable 'tool-bar-map) vc-dir-tool-bar-map)
-  (set (make-local-variable 'client-mode) client-object)
+  (set (make-local-variable 'vc-client-mode) client-object)
   (let ((buffer-read-only nil))
     (erase-buffer)
     (set (make-local-variable 'vc-dir-process-buffer) nil)