Merge common parts of DOS/WIN32 and OS2 file-name customization.

diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index 25e91eb51ad2bd6855556665917408855c3533df..ecb9d1094b52ebfbec68499edb8de6a12994a4fb 100644 (file)
--- 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 fa45949612ea76b9981ecb9410e26df2a696a400..a780727aeeb06c8e69ac8713026c725ea5bb0706 100644 (file)
--- 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))))