From: Christopher Schmidt Date: Fri, 1 Feb 2013 17:19:24 +0000 (+0100) Subject: * vc/vc-arch.el (vc-arch-registered): X-Git-Tag: emacs-24.3.90~173^2~7^2~168 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af314ba001f576c59dcc2df8506b34cdf12b5c63;p=emacs.git * vc/vc-arch.el (vc-arch-registered): * vc/vc-bzr.el (vc-bzr-registered): * vc/vc-cvs.el (vc-cvs-registered): * vc/vc-git.el (vc-git-registered): * vc/vc-hg.el (vc-hg-registered): * vc/vc-mtn.el (vc-mtn-registered): * vc/vc-svn.el (vc-svn-registered): Suppress load messages. (Bug#13139) --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e42b513baea..9fba2817b1e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2012-02-01 Christopher Schmidt + * vc/vc-arch.el (vc-arch-registered): + * vc/vc-bzr.el (vc-bzr-registered): + * vc/vc-cvs.el (vc-cvs-registered): + * vc/vc-git.el (vc-git-registered): + * vc/vc-hg.el (vc-hg-registered): + * vc/vc-mtn.el (vc-mtn-registered): + * vc/vc-svn.el (vc-svn-registered): Suppress load messages. + (Bug#13139) + * info.el (Info-next-reference, Info-prev-reference): Add numeric prefix argument. (Bug#11656) diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 3dbaae52b37..52609457ebc 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -101,7 +101,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;;;###autoload (defun vc-arch-registered (file) ;;;###autoload (if (vc-find-root file "{arch}/=tagging-method") ;;;###autoload (progn -;;;###autoload (load "vc-arch") +;;;###autoload (load "vc-arch" nil t) ;;;###autoload (vc-arch-registered file)))) (defun vc-arch-add-tagline () diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 0968c83ae5f..d0912cb719c 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -291,7 +291,7 @@ in the repository root directory of FILE." ;;;###autoload (defun vc-bzr-registered (file) ;;;###autoload (if (vc-find-root file vc-bzr-admin-checkout-format-file) ;;;###autoload (progn -;;;###autoload (load "vc-bzr") +;;;###autoload (load "vc-bzr" nil t) ;;;###autoload (vc-bzr-registered file)))) (defun vc-bzr-registered (file) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index d90596baca0..407e691439b 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -198,7 +198,7 @@ See also variable `vc-cvs-sticky-date-format-string'." ;;;###autoload "Return non-nil if file F is registered with CVS." ;;;###autoload (when (file-readable-p (expand-file-name ;;;###autoload "CVS/Entries" (file-name-directory f))) -;;;###autoload (load "vc-cvs") +;;;###autoload (load "vc-cvs" nil t) ;;;###autoload (vc-cvs-registered f))) (defun vc-cvs-registered (file) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 29f7aaa5480..17de931628b 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -168,7 +168,7 @@ matching the resulting Git log output, and KEYWORDS is a list of ;;;###autoload "Return non-nil if FILE is registered with git." ;;;###autoload (if (vc-find-root file ".git") ; Short cut. ;;;###autoload (progn -;;;###autoload (load "vc-git") +;;;###autoload (load "vc-git" nil t) ;;;###autoload (vc-git-registered file)))) (defun vc-git-registered (file) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 5c8201e51cc..f39ef568e8b 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -176,7 +176,7 @@ highlighting the Log View buffer." ;;;###autoload "Return non-nil if FILE is registered with hg." ;;;###autoload (if (vc-find-root file ".hg") ; short cut ;;;###autoload (progn -;;;###autoload (load "vc-hg") +;;;###autoload (load "vc-hg" nil t) ;;;###autoload (vc-hg-registered file)))) ;; Modeled after the similar function in vc-bzr.el diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index f2569e2145d..06827a5e027 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -72,7 +72,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;;;###autoload (defun vc-mtn-registered (file) ;;;###autoload (if (vc-find-root file vc-mtn-admin-format) ;;;###autoload (progn -;;;###autoload (load "vc-mtn") +;;;###autoload (load "vc-mtn" nil t) ;;;###autoload (vc-mtn-registered file)))) (defun vc-mtn-revision-granularity () 'repository) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index b79af07a756..fcdd792a69b 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -123,7 +123,7 @@ If you want to force an empty list of arguments, use t." ;;;###autoload "_svn") ;;;###autoload (t ".svn")))) ;;;###autoload (when (vc-find-root f admin-dir) -;;;###autoload (load "vc-svn") +;;;###autoload (load "vc-svn" nil t) ;;;###autoload (vc-svn-registered f)))) (defun vc-svn-registered (file)