From 56931d6383a9fa1cdffb5b2b41ff9a88d3c6d257 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 25 Oct 1995 03:26:02 +0000
Subject: [PATCH] Merge common parts of DOS/WIN32 and OS2 file-name
 customization.

---
 v7/src/edwin/dosfile.scm | 5 +++--
 v7/src/edwin/os2.scm     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index 25e91eb51..ecb9d1094 100644
--- a/v7/src/edwin/dosfile.scm
+++ b/v7/src/edwin/dosfile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: dosfile.scm,v 1.1 1995/10/25 02:18:54 cph Exp $
+;;;	$Id: dosfile.scm,v 1.2 1995/10/25 03:26:02 cph Exp $
 ;;;
 ;;;	Copyright (c) 1994-95 Massachusetts Institute of Technology
 ;;;
@@ -269,7 +269,8 @@ Includes the new backup.  Must be > 0."
 	(pathname-new-type pathname "sav"))))
 
 (define (dos/buffer-long-name buffer)
-  (if (string-ci=? "hpfs" (car (os/fs-drive-type directory)))
+  (if (string-ci=? "hpfs"
+		   (car (os/fs-drive-type (buffer-default-directory buffer))))
       (dos/buffer-hpfs-name buffer)
       (buffer-name buffer)))
 
diff --git a/v7/src/edwin/os2.scm b/v7/src/edwin/os2.scm
index fa4594961..a780727ae 100644
--- a/v7/src/edwin/os2.scm
+++ b/v7/src/edwin/os2.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: os2.scm,v 1.24 1995/10/25 02:19:44 cph Exp $
+;;;	$Id: os2.scm,v 1.25 1995/10/25 03:25:55 cph Exp $
 ;;;
 ;;;	Copyright (c) 1994-95 Massachusetts Institute of Technology
 ;;;
@@ -331,7 +331,7 @@ filename suffix \".gz\"."
   "sendmail")
 
 (define (os/rmail-pop-procedure)
-  (and (os2/find-program "popclient" (ref-variable exec-path) #f)
+  (and (dos/find-program "popclient" (ref-variable exec-path) #f)
        (lambda (server user-name password directory)
 	 (os2-pop-client server user-name password directory))))
 
-- 
2.25.1