From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chet Wood Newsgroups: gmane.emacs.bugs Subject: vc-next-action-dired fails if file is in a subdirectory Date: Fri, 27 Oct 2006 11:53:52 -0700 (PDT) Message-ID: <200610271853.k9RIrqLK024978@windhorse.sfbay.sun.com> NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1162049308 14986 80.91.229.2 (28 Oct 2006 15:28:28 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 28 Oct 2006 15:28:28 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Oct 28 17:28:24 2006 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gdq6h-0007IH-6t for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Oct 2006 17:28:23 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gdq6g-00063L-Bh for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Oct 2006 11:28:22 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GdWq7-0000SR-4a for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2006 14:53:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GdWq2-0000Ok-D4 for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2006 14:53:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GdWq2-0000Of-81 for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2006 14:53:54 -0400 Original-Received: from [192.18.42.26] (helo=nwkea-mail-4.sun.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GdWq2-0002DQ-6S for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2006 14:53:54 -0400 Original-Received: from sfbaymail1sca.SFBay.Sun.COM ([129.145.154.35]) by nwkea-mail-4.sun.com (8.13.6+Sun/8.12.9) with ESMTP id k9RIrqUO016147 for ; Fri, 27 Oct 2006 11:53:52 -0700 (PDT) Original-Received: from windhorse.sfbay.sun.com (windhorse.SFBay.Sun.COM [129.144.67.56]) by sfbaymail1sca.SFBay.Sun.COM (8.13.6+Sun/8.13.6/ENSMAIL,v2.2) with ESMTP id k9RIrqrD010438; Fri, 27 Oct 2006 11:53:52 -0700 (PDT) Original-Received: from windhorse.sfbay.sun.com (localhost [127.0.0.1]) by windhorse.sfbay.sun.com (8.12.10+Sun/8.12.10) with ESMTP id k9RIrqpE024981; Fri, 27 Oct 2006 11:53:52 -0700 (PDT) Original-Received: (from cwood@localhost) by windhorse.sfbay.sun.com (8.12.10+Sun/8.12.10/Submit) id k9RIrqLK024978; Fri, 27 Oct 2006 11:53:52 -0700 (PDT) Original-To: bug-gnu-emacs@gnu.org X-Mailman-Approved-At: Sat, 28 Oct 2006 11:27:57 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:15398 Archived-At: This bug report will be sent to the Free Software Foundation, not to your local site managers! Please write in English, because the Emacs maintainers do not have translators to read other languages for them. Your bug report will be posted to the bug-gnu-emacs@gnu.org mailing list, and to the gnu.emacs.bug news group. In GNU Emacs 21.3.1 (sparc-sun-solaris2.9, X toolkit) of 2004-06-09 on camillia configured using `configure --prefix=/import/freetools/local/emacs/21.3-64 --enable-gcc --enable-largefile '--x-libraries=-R/usr/openwin/lib/sparcv9 -R/usr/lib/sparcv9 -L/usr/openwin/lib/sparcv9 -L/usr/lib/sparcv9'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil locale-coding-system: nil default-enable-multibyte-characters: t Please describe exactly what actions triggered the bug and the precise symptoms of the bug: When using recursive vc-dired with SCCS, and the parent directory is one or more levels above the directory where the file is, vcdiff cannot find the file. It expects it to be in the current directory. The following diffs for vc-next-action-dired seem to fix the immediate problem, but I don't believe the fix is correct or complete---for example vc-dired doesn't automatically refresh its state after the file is checked in. --- vc.el.~1~ 2006-10-27 11:13:51.703361000 -0700 +++ vc.el 2006-10-27 11:46:26.419703000 -0700 @@ -1181,15 +1181,18 @@ Ignores FILE and REV, but passes on COMMENT." (let ((dired-buffer (current-buffer)) (dired-dir default-directory)) + (setq odefault default-directory) (dired-map-over-marks (let ((file (dired-get-filename))) (message "Processing %s..." file) + (setq default-directory (file-name-directory file)) (vc-next-action-on-file file nil comment) (set-buffer dired-buffer) (set-window-configuration vc-dired-window-configuration) (message "Processing %s...done" file)) - nil t)) - (dired-move-to-filename)) + nil t)) + (dired-move-to-filename) + (setq default-directory odefault)) ;; Here's the major entry point. ---------- end of diffs ------------- Recent input: C-a C-n C-n C-n C-n C-n C-a C-M-n C-M-p C-p C-p C-p C-p C-p C-e C-M-p C-x C-s C-x o M-> C-p C-n M-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-SPC C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-a C-SPC C-v C-v C-n C-n w M-x r e p o r t - b SPC t u SPC e m SPC SPC Recent messages: Wrote /home/cwood/eLisp/vc.el Mark set History item: 1 Saving file /home/cwood/eLisp/vc.el... Wrote /home/cwood/eLisp/vc.el Mark set History item: 1 Mark set [2 times] Saved text from "--- vc.el.~1~ 2006-10-27 11:13:51.703361" Loading emacsbug...done