From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Simon Leinen Newsgroups: gmane.emacs.bugs Subject: bug#19198: 25.0.50; vc.el with RCS: undefined function `vc-master-name' Date: Wed, 26 Nov 2014 18:34:58 +0100 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417024638 29840 80.91.229.3 (26 Nov 2014 17:57:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 17:57:18 +0000 (UTC) Cc: esr@thyrsus.com To: 19198@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 26 18:57:10 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xtgpx-0001n6-2t for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Nov 2014 18:57:09 +0100 Original-Received: from localhost ([::1]:35373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgpw-0003Pz-O0 for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Nov 2014 12:57:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgps-0003Pu-Jp for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:57:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xtgpr-0001k2-Ar for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:57:04 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgpr-0001jy-7P for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:57:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xtgpr-0004TB-16 for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:57:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Simon Leinen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 Nov 2014 17:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19198 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141702457517103 (code B ref -1); Wed, 26 Nov 2014 17:57:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 26 Nov 2014 17:56:15 +0000 Original-Received: from localhost ([127.0.0.1]:46488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xtgp4-0004Rn-A0 for submit@debbugs.gnu.org; Wed, 26 Nov 2014 12:56:14 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:50939) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xtgp1-0004Re-Ka for submit@debbugs.gnu.org; Wed, 26 Nov 2014 12:56:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xtgov-0001TO-J1 for submit@debbugs.gnu.org; Wed, 26 Nov 2014 12:56:11 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:52897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgov-0001TJ-G7 for submit@debbugs.gnu.org; Wed, 26 Nov 2014 12:56:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgop-0003Kf-AJ for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:56:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xtgoo-0001RW-F6 for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:55:59 -0500 Original-Received: from teruel.switch.ch ([2001:620:0:1b::28]:47693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgoo-0001Qp-4T for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 12:55:58 -0500 Original-Received: from surlej.switch.ch (surlej.switch.ch [IPv6:2001:620:0:e::69]) by teruel.switch.ch (8.14.4/8.14.4/Debian-4) with ESMTP id sAQHYxbI024656 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 26 Nov 2014 18:35:00 +0100 Original-Received: from [2001:620:0:68::106] (helo=macsl.switch.ch) by surlej.switch.ch with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.72) (envelope-from ) id 1XtgUV-00074E-GA; Wed, 26 Nov 2014 18:34:59 +0100 X-CanIt-Geo: ip=2001:620:0:e::69; country=CH X-CanItPRO-Stream: switch-ch:outbound (inherits from switch-ch:default, base:default) X-Canit-Stats-ID: Bayes signature not available X-Scanned-By: CanIt (www . roaringpenguin . com) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:96633 Archived-At: 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).