From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Masatake YAMATO Newsgroups: gmane.emacs.devel Subject: ~/{arch} causes an error in find-file Date: Mon, 12 Apr 2004 12:39:43 +0900 (JST) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20040412.123943.59652920.jet@gyve.org> References: <20040408.210748.25163220.jet@gyve.org> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1081746822 345 80.91.224.253 (12 Apr 2004 05:13:42 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 12 Apr 2004 05:13:42 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Apr 12 07:13:34 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BCtlG-00057I-00 for ; Mon, 12 Apr 2004 07:13:34 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BCtlG-000195-00 for ; Mon, 12 Apr 2004 07:13:34 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCsfS-0000rB-LE for emacs-devel@quimby.gnus.org; Mon, 12 Apr 2004 00:03:30 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1BCsdO-0008Ek-By for emacs-devel@gnu.org; Mon, 12 Apr 2004 00:01:22 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1BCsdJ-0008Bp-9A for emacs-devel@gnu.org; Mon, 12 Apr 2004 00:01:18 -0400 Original-Received: from [199.232.41.8] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.30) id 1BCsdI-00089N-Jl for emacs-devel@gnu.org; Mon, 12 Apr 2004 00:01:16 -0400 Original-Received: from [210.130.136.40] (helo=r-maa.spacetown.ne.jp) by mx20.gnu.org with esmtp (Exim 4.30) id 1BCsLF-0004Zs-9c for emacs-devel@gnu.org; Sun, 11 Apr 2004 23:42:37 -0400 Original-Received: from localhost ([219.120.63.249]) by r-maa.spacetown.ne.jp (8.11.6) with ESMTP id i3C3dvK13998; Mon, 12 Apr 2004 12:39:57 +0900 (JST) Original-To: monnier@iro.umontreal.ca In-Reply-To: <20040408.210748.25163220.jet@gyve.org> X-Mailer: Mew version 4.0.62 on Emacs 21.3.50 / Mule 5.0 (SAKAKI) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:21513 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21513 Hi, After I created an tla archive at ~/{arch}, C-x C-f raise an error. I have found that vc-workfile-version used in vc-arch-mode-line-string returns nil. A temporary solution is attached. Masatake YAMATO 2004-04-12 Masatake YAMATO * vc-arch.el (vc-arch-mode-line-string): Return an empty string if `vc-workfile-version' returns nil. cvs diff: warning: unrecognized response `access control disabled, clients can connect from any host' from cvs server Index: lisp/vc-arch.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/vc-arch.el,v retrieving revision 1.5 diff -u -r1.5 vc-arch.el --- lisp/vc-arch.el 23 Mar 2004 21:36:49 -0000 1.5 +++ lisp/vc-arch.el 12 Apr 2004 03:32:50 -0000 @@ -309,15 +309,18 @@ (defun vc-arch-mode-line-string (file) "Return string for placement in modeline by `vc-mode-line' for FILE." (let ((rev (vc-workfile-version file))) - (dolist (rule vc-arch-mode-line-rewrite) - (if (string-match (car rule) rev) - (setq rev (replace-match (cdr rule) t nil rev)))) - (format "Arch%c%s" - (case (vc-state file) - ((up-to-date needs-patch) ?-) - (added ?@) - (t ?:)) - rev))) + (if rev + (progn + (dolist (rule vc-arch-mode-line-rewrite) + (if (string-match (car rule) rev) + (setq rev (replace-match (cdr rule) t nil rev)))) + (format "Arch%c%s" + (case (vc-state file) + ((up-to-date needs-patch) ?-) + (added ?@) + (t ?:)) + rev)) + ""))) (defun vc-arch-diff3-rej-p (rej) (let ((attrs (file-attributes rej)))