From: Simon Leinen <simon.leinen@switch.ch>
To: 19198@debbugs.gnu.org
Cc: esr@thyrsus.com
Subject: bug#19198: 25.0.50; vc.el with RCS: undefined function `vc-master-name'
Date: Wed, 26 Nov 2014 18:34:58 +0100 [thread overview]
Message-ID: <aafvd5zwzh.fsf@macsl.switch.ch> (raw)
When I run "./src/emacs -Q" and open a file that's under RCS version
control, I get the following error:
Symbol's function definition is void: vc-master-name
This function is defined in the new `vc-filewise.el'.
It is called from vc-rcs.el and vc-sccs.el. These two files also call
`vc-rename-master'. For `vc-rename-master', autoloads are defined in
`vc-rcs.el' and `vc-sccs.el'; but the autoloads still point to "vc"
rather than "vc-filewise". I fixed that and also added autoloads for
`vc-master-name'. So please consider the following patch. With it,
this error should be gone. I still run into another issue, which I'll
report separately.
--
Simon.
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 0b839a6..341a1d4 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -229,6 +229,8 @@ For a description of possible values, see `vc-check-master-templates'."
(vc-rcs-fetch-master-state file)
(vc-file-getprop file 'vc-working-revision))))
+(autoload 'vc-master-name "vc-filewise")
+
(defun vc-rcs-latest-on-branch-p (file &optional version)
"Return non-nil if workfile version of FILE is the latest on its branch.
When VERSION is given, perform check for that version."
@@ -974,7 +976,7 @@ Uses `rcs2log' which only works for RCS and CVS."
nil t)
(replace-match "$\\1$"))))
-(autoload 'vc-rename-master "vc")
+(autoload 'vc-rename-master "vc-filewise")
(defun vc-rcs-rename-file (old new)
;; Just move the master file (using vc-rcs-master-templates).
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 780efc4..3d33ae4 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -174,6 +174,8 @@ For a description of possible values, see `vc-check-master-templates'."
(push (list frel state) result))))
(funcall update-function result)))
+(autoload 'vc-master-name "vc-filewise")
+
(defun vc-sccs-working-revision (file)
"SCCS-specific version of `vc-working-revision'."
(with-temp-buffer
@@ -471,7 +473,7 @@ Remaining arguments are ignored."
(goto-char (point-min))
(re-search-forward "%[A-Z]%" nil t)))
-(autoload 'vc-rename-master "vc")
+(autoload 'vc-rename-master "vc-filewise")
(defun vc-sccs-rename-file (old new)
;; Move the master file (using vc-rcs-master-templates).
next reply other threads:[~2014-11-26 17:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 17:34 Simon Leinen [this message]
2014-11-26 17:50 ` bug#19196: 25.0.50; vc.el with RCS: undefined function `vc-master-name' Eric S. Raymond
2014-11-26 17:59 ` Simon Leinen
2014-11-26 18:22 ` bug#19198: " Eric S. Raymond
2014-11-26 19:12 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aafvd5zwzh.fsf@macsl.switch.ch \
--to=simon.leinen@switch.ch \
--cc=19198@debbugs.gnu.org \
--cc=esr@thyrsus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.