From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: OKAZAKI Tetsurou Newsgroups: gmane.emacs.bugs Subject: bug#10589: 24.0.92; vc-register; use deduced backend for checking registered Date: Tue, 24 Jan 2012 11:35:52 +0900 Message-ID: <86boptg73r.wl%%5253605f36527b613438407bc85287410830e04c@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: dough.gmane.org 1327372616 22201 80.91.229.12 (24 Jan 2012 02:36:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 24 Jan 2012 02:36:56 +0000 (UTC) To: 10589@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 24 03:36:48 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RpWFc-00087n-Ig for geb-bug-gnu-emacs@m.gmane.org; Tue, 24 Jan 2012 03:36:48 +0100 Original-Received: from localhost ([::1]:52010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpWFc-00062U-18 for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 Jan 2012 21:36:48 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:41148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpWFZ-00062L-OM for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:36:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpWFY-0005wc-Mv for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:36:45 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpWFY-0005wW-IN for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:36:44 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RpWFq-0000if-44 for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:37:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: OKAZAKI Tetsurou Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Jan 2012 02:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 10589 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.13273726092742 (code B ref -1); Tue, 24 Jan 2012 02:37:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Jan 2012 02:36:49 +0000 Original-Received: from localhost ([127.0.0.1]:41151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RpWFc-0000iB-Qc for submit@debbugs.gnu.org; Mon, 23 Jan 2012 21:36:49 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:38697) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RpWFW-0000hv-WD for submit@debbugs.gnu.org; Mon, 23 Jan 2012 21:36:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpWF8-0005ti-SI for submit@debbugs.gnu.org; Mon, 23 Jan 2012 21:36:19 -0500 Original-Received: from lists.gnu.org ([140.186.70.17]:56730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpWF8-0005te-NN for submit@debbugs.gnu.org; Mon, 23 Jan 2012 21:36:18 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:41016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpWF7-0005ow-Dm for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:36:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpWF6-0005tJ-Aq for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:36:17 -0500 Original-Received: from mail-iy0-f169.google.com ([209.85.210.169]:39345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpWF6-0005t7-50 for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2012 21:36:16 -0500 Original-Received: by iadk27 with SMTP id k27so283144iad.0 for ; Mon, 23 Jan 2012 18:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:message-id:from:to:subject:user-agent:mime-version :content-type; bh=WcfWJckS3tadf6wWS4zEcWJoueSCAGkj0k4wZbPIcv8=; b=gabCz74EEQ45ltM28PDpCEsQU/C5NzI6TX5EMoPL/f+oNEdM5rsxe8BAYFHsNOkzr3 v7MbeOlQjT3CSPshkJ9rf6M9vh4RyPUfd8SjTCeGfcD3hfC8DuF9dytQRZdeUjHfv2kZ Y62mtg/l/MxZm4l/zjtF+cK9GP9ZatJ2p0ESU= Original-Received: by 10.50.184.227 with SMTP id ex3mr12568965igc.17.1327372574828; Mon, 23 Jan 2012 18:36:14 -0800 (PST) Original-Received: from zeroset.gmail.com (nttkyo903168.tkyo.nt.ftth.ppp.infoweb.ne.jp. [116.83.153.168]) by mx.google.com with ESMTPS id l35sm53509993ibj.0.2012.01.23.18.36.12 (version=SSLv3 cipher=OTHER); Mon, 23 Jan 2012 18:36:13 -0800 (PST) User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/24.0 Mule/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:55941 Archived-At: Current implementation of `vc-register' fails to register an unregistered item which is already registered to another backend. Using `vc-call-backend' with deduced `backend' instead of `vc-backend' and `vc-registered' resolves this issue. === modified file 'lisp/vc/vc.el' *** lisp/vc/vc.el 2012-01-19 07:21:25 +0000 --- lisp/vc/vc.el 2012-01-20 19:55:38 +0000 *************** first backend that could register the fi *** 1277,1287 **** (dolist (fname files) (let ((bname (get-file-buffer fname))) (unless fname (setq fname buffer-file-name)) ! (when (vc-backend fname) ! (if (vc-registered fname) ! (error "This file is already registered") ! (unless (y-or-n-p "Previous master file has vanished. Make a new one? ") ! (error "Aborted")))) ;; Watch out for new buffers of size 0: the corresponding file ;; does not exist yet, even though buffer-modified-p is nil. (when bname --- 1277,1284 ---- (dolist (fname files) (let ((bname (get-file-buffer fname))) (unless fname (setq fname buffer-file-name)) ! (when (vc-call-backend backend 'registered fname) ! (error "This file is already registered")) ;; Watch out for new buffers of size 0: the corresponding file ;; does not exist yet, even though buffer-modified-p is nil. (when bname