From: Eric S. Raymond <esr@thyrsus.com>
Date: Sat, 22 Nov 2014 11:32:48 +0000 (-0500)
Subject: Unbreak the build.
X-Git-Tag: emacs-25.0.90~2635^2~389^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cec23966252b5f4d87c6c6b56c7660b8d578865c;p=emacs.git

Unbreak the build.

I don't really understand why this reversion works, but it will do until I can
actually comprehend the bizarre hairball that is Emacs bootstrapping.
---

diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el
index 9bdde5e5e31..bc8a8dec416 100644
--- a/lisp/vc/vc-filewise.el
+++ b/lisp/vc/vc-filewise.el
@@ -81,18 +81,6 @@ If the file is not registered, or the master name is not known, return nil."
 	  (vc-file-setprop file 'vc-name result)
 	nil))))				; Not registered
 
-(defun vc-possible-master (s dirname basename)
-  (cond
-   ((stringp s) (format s dirname basename))
-   ((functionp s)
-    ;; The template is a function to invoke.  If the
-    ;; function returns non-nil, that means it has found a
-    ;; master.  For backward compatibility, we also handle
-    ;; the case that the function throws a 'found atom
-    ;; and a pair (cons MASTER-FILE BACKEND).
-    (let ((result (catch 'found (funcall s dirname basename))))
-      (if (consp result) (car result) result)))))
-
 (defun vc-check-master-templates (file templates)
   "Return non-nil if there is a master corresponding to FILE.
 
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 8ce7ec835cb..a084f9da73a 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -637,6 +637,19 @@ If FILE is not registered, this function always returns nil."
 	  (vc-file-setprop file 'vc-master-name result)
 	nil))))				; Not registered
 
+;;;###autoload
+(defun vc-possible-master (s dirname basename)
+  (cond
+   ((stringp s) (format s dirname basename))
+   ((functionp s)
+    ;; The template is a function to invoke.  If the
+    ;; function returns non-nil, that means it has found a
+    ;; master.  For backward compatibility, we also handle
+    ;; the case that the function throws a 'found atom
+    ;; and a pair (cons MASTER-FILE BACKEND).
+    (let ((result (catch 'found (funcall s dirname basename))))
+      (if (consp result) (car result) result)))))
+
 (defun vc-check-master-templates (file templates)
   "Return non-nil if there is a master corresponding to FILE.