GNU bug report logs -
#19198
25.0.50; vc.el with RCS: undefined function `vc-master-name'
Previous Next
Reported by: Simon Leinen <simon.leinen <at> switch.ch>
Date: Wed, 26 Nov 2014 17:57:02 UTC
Severity: normal
Merged with 19196
Found in version 25.0.50
Done: Glenn Morris <rgm <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 19198 in the body.
You can then email your comments to 19198 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#19198
; Package
emacs
.
(Wed, 26 Nov 2014 17:57:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Simon Leinen <simon.leinen <at> switch.ch>
:
New bug report received and forwarded. Copy sent to
bug-gnu-emacs <at> gnu.org
.
(Wed, 26 Nov 2014 17:57:03 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
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).
Information forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#19198
; Package
emacs
.
(Wed, 26 Nov 2014 18:24:01 GMT)
Full text and
rfc822 format available.
Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):
Simon Leinen <simon.leinen <at> switch.ch>:
> > I will merge. *Very* odd that I didn't run into my RCS testing.
>
> Thanks. Maybe vc-filewise.elc got loaded by something else before
> your tests caused vc-master-name to be called?
That does seem like the most likely explanation.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
Information forwarded
to
bug-gnu-emacs <at> gnu.org
:
bug#19198
; Package
emacs
.
(Wed, 26 Nov 2014 19:13:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 19198 <at> debbugs.gnu.org (full text, mbox):
If you want to cc someone on a new bug report, please use X-Debbugs-Cc:
instead of Cc:.
Merged 19196 19198.
Request was from
Glenn Morris <rgm <at> gnu.org>
to
control <at> debbugs.gnu.org
.
(Wed, 26 Nov 2014 19:13:02 GMT)
Full text and
rfc822 format available.
bug closed, send any further explanations to
19198 <at> debbugs.gnu.org and Simon Leinen <simon.leinen <at> switch.ch>
Request was from
Glenn Morris <rgm <at> gnu.org>
to
control <at> debbugs.gnu.org
.
(Sat, 29 Nov 2014 21:36:02 GMT)
Full text and
rfc822 format available.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sun, 28 Dec 2014 12:24:04 GMT)
Full text and
rfc822 format available.
This bug report was last modified 10 years and 180 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.