From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Yoichi NAKAYAMA Newsgroups: gmane.emacs.devel Subject: patch: fix wrong-type-argument error in vc-registered Date: Tue, 12 Oct 2004 23:48:57 +0900 Organization: Geiin.org Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: <87pt3ohu06.wl%yoichi@geiin.org> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 (generated by EMIKO 1.14.1 - "Choanoflagellata") Content-Type: text/plain; charset=US-ASCII X-Trace: sea.gmane.org 1097592614 8755 80.91.229.6 (12 Oct 2004 14:50:14 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 12 Oct 2004 14:50:14 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 12 16:50:08 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CHNya-0000em-00 for ; Tue, 12 Oct 2004 16:50:08 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CHO5a-0007F4-0t for ged-emacs-devel@m.gmane.org; Tue, 12 Oct 2004 10:57:22 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CHO5T-0007Ei-65 for emacs-devel@gnu.org; Tue, 12 Oct 2004 10:57:15 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CHO5R-0007Dw-S1 for emacs-devel@gnu.org; Tue, 12 Oct 2004 10:57:14 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CHO5R-0007Dt-PT for emacs-devel@gnu.org; Tue, 12 Oct 2004 10:57:13 -0400 Original-Received: from [80.91.229.2] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CHNxW-00008t-UI for emacs-devel@gnu.org; Tue, 12 Oct 2004 10:49:03 -0400 Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1CHNxV-0007DN-00 for ; Tue, 12 Oct 2004 16:49:01 +0200 Original-Received: from 109.40.244.43.ap.yournet.ne.jp ([43.244.40.109]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Oct 2004 16:49:01 +0200 Original-Received: from yoichi by 109.40.244.43.ap.yournet.ne.jp with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Oct 2004 16:49:01 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 31 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: 109.40.244.43.ap.yournet.ne.jp User-Agent: Wanderlust/2.11.32 (Wonderwall) EMIKO/1.14.1 (Choanoflagellata) FLIM/1.14.7 (=?ISO-2022-JP?B?GyRCOzA+chsoQg==?=) APEL/10.6 Emacs/21.3.50 (i686-pc-linux-gnu) MULE/5.0 (=?ISO-2022-JP?B?GyRCOC1MWhsoQg==?=) X-Face: wLZki+KbGjgKe0,<&3g*rA|R**vj[a8L%[v]ecJh1L(Uqm|LBx; v7Nq7n%?0d.aS]F#[~C\!{m?m,C&#U5}$_pZvBR>5VmX1Ol0`P\M-U8`sUF<5Quj'z&zzW8r|Zl9#W7Wut3duYzpKrP{n+AbarKtJ!i"Al7]P; -?[=iBZa*]r=>C':0~JECx]IH+RXq=/hUX}MB9e]oQKBxsDd/ X-SKK: Daredevil SKK/12.2.1 (Sone) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:28301 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:28301 The change 2004-09-12 Stefan Monnier * vc-hooks.el (vc-ignore-dir-regexp): New var. overlooked that (file-name-directory file) may return nil. Following is the patch against it. Regards, -- Yoichi NAKAYAMA Index: vc-hooks.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/vc-hooks.el,v retrieving revision 1.169 diff -u -r1.169 vc-hooks.el --- vc-hooks.el 13 Sep 2004 03:36:11 -0000 1.169 +++ vc-hooks.el 12 Oct 2004 14:38:39 -0000 @@ -336,7 +336,9 @@ backend is tried first." (let (handler) (cond - ((string-match vc-ignore-dir-regexp (file-name-directory file)) nil) + ((and (file-name-directory file) + (string-match vc-ignore-dir-regexp (file-name-directory file))) + nil) ((and (boundp 'file-name-handler-alist) (setq handler (find-file-name-handler file 'vc-registered))) ;; handler should set vc-backend and return t if registered