From xemacs-m  Sun Feb 16 13:17:16 1997
Received: from mailhost.lanl.gov (mailhost.lanl.gov [128.165.3.12])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id NAA28278
	for <xemacs-beta@xemacs.org>; Sun, 16 Feb 1997 13:17:15 -0600 (CST)
Received: from branagh.ta52.lanl.gov (branagh.ta52.lanl.gov [128.165.144.9]) by mailhost.lanl.gov (8.8.5/8.8.3) with SMTP id MAA19944 for <xemacs-beta@xemacs.org>; Sun, 16 Feb 1997 12:17:16 -0700 (MST)
Received: by branagh.ta52.lanl.gov (SMI-8.6/SMI-SVR4)
	id MAA11052; Sun, 16 Feb 1997 12:13:31 -0700
Date: Sun, 16 Feb 1997 12:13:31 -0700
Message-Id: <199702161913.MAA11052@branagh.ta52.lanl.gov>
From: "John A. Turner" <turner@branagh.ta52.lanl.gov>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: xemacs-beta@xemacs.org
Subject: Re: 19.15-b94 on Solaris 2.5.1/SunPro CC 4.2
In-Reply-To: <199702161901.MAA10975@branagh.ta52.lanl.gov>
References: <m2zpx5co7c.fsf@altair.xemacs.org>
	<199702161901.MAA10975@branagh.ta52.lanl.gov>
Reply-To: turner@lanl.gov

I wrote:

 > First C-x C-f evoked this:
 > 
 > Signaling: (void-variable default-dir-emacs-version)
 >   default-directory()
 >   (read-file-name "Find file: " (default-directory))
 > )
 >   (expand-file-name (read-file-name "Find file: " (default-directory)))
 > )
 >   (list (expand-file-name (read-file-name "Find file: " ...)))
 > )
 >   call-interactively(find-file)
 > 
 > Traced to this in efs' default-dir.el, I think:

[snip]

 > Looks like skew between -version and -variant?

Changing default-dir-emacs-version to default-dir-emacs-variant does
seem to have solved the problem (and seems correct because the latter
is indeed used later in default-dir.el).

Here's the incredibly difficult patch:

diff -c default-dir.el.orig default-dir.el
*** default-dir.el.orig Sat Feb 15 18:28:49 1997
--- default-dir.el      Sun Feb 16 11:59:21 1997
***************
*** 52,58 ****
  Will use the variable default-directory-function if it non-nil."
    (if default-directory-function
        (funcall default-directory-function)
!     (if (eq default-dir-emacs-version 'xemacs)
        (abbreviate-file-name default-directory t)
        (abbreviate-file-name default-directory))))
  
--- 52,58 ----
  Will use the variable default-directory-function if it non-nil."
    (if default-directory-function
        (funcall default-directory-function)
!     (if (eq default-dir-emacs-variant 'xemacs)
        (abbreviate-file-name default-directory t)
        (abbreviate-file-name default-directory))))

-- 
John Turner
http://www.lanl.gov/home/turner

