From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Karl Chen Newsgroups: gmane.emacs.devel Subject: bug fix for files.el change 1.633 (dired-directory not defined) Date: Tue, 11 Feb 2003 23:53:11 -0800 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <15945.64871.469361.375781@hkn.eecs.berkeley.edu> Reply-To: quarl@quarl.org NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1045036406 10546 80.91.224.249 (12 Feb 2003 07:53:26 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 12 Feb 2003 07:53:26 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18irhs-0002jr-00 for ; Wed, 12 Feb 2003 08:53:24 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18irtk-0004QL-00 for ; Wed, 12 Feb 2003 09:05:41 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18irj3-0005bb-01 for emacs-devel@quimby.gnus.org; Wed, 12 Feb 2003 02:54:37 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18iric-0005Kn-00 for emacs-devel@gnu.org; Wed, 12 Feb 2003 02:54:10 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18iriE-00050F-00 for emacs-devel@gnu.org; Wed, 12 Feb 2003 02:53:46 -0500 Original-Received: from hkn.eecs.berkeley.edu ([128.32.47.228]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18irhh-0004eZ-00 for emacs-devel@gnu.org; Wed, 12 Feb 2003 02:53:13 -0500 Original-Received: from quarl by hkn.eecs.berkeley.edu with local id 18irhf-0002TL-00; Tue, 11 Feb 2003 23:53:11 -0800 Original-To: Emacs Developement List X-Mailer: VM 7.07.q1 under Emacs 21.3.50.19 X-Attribution: quarl X-Quack-Archive: 1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:11579 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:11579 The recent change to files.el breaks `find-alternate-file' until dired.el is loaded. It uses the variable `dired-directory' which is defined only in dired.el. This patch below fixes it. --- files.el.~1.633.~ 2003-02-06 00:58:29.000000000 -0800 +++ files.el 2003-02-11 23:19:13.000000000 -0800 @@ -940,7 +940,7 @@ (let ((obuf (current-buffer)) (ofile buffer-file-name) (onum buffer-file-number) - (odir dired-directory) + (odir (and (boundp 'dired-directory) dired-directory)) (otrue buffer-file-truename) (oname (buffer-name))) (if (get-buffer " **lose**") -- Karl Chen / quarl@quarl.org