diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-11-22 06:32:48 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-11-22 06:32:48 -0500 |
| commit | cec23966252b5f4d87c6c6b56c7660b8d578865c (patch) | |
| tree | d35bd610fb3efa6cc868f08cb02e0b8154440306 | |
| parent | e9b190263439a1b3c9c41b70cc91d48a215e4be8 (diff) | |
| download | emacs-cec23966252b5f4d87c6c6b56c7660b8d578865c.tar.gz emacs-cec23966252b5f4d87c6c6b56c7660b8d578865c.tar.bz2 emacs-cec23966252b5f4d87c6c6b56c7660b8d578865c.zip | |
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.
| -rw-r--r-- | lisp/vc/vc-filewise.el | 12 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 13 |
2 files changed, 13 insertions, 12 deletions
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. |