Use ANSI char images for all operating systems. Both OS/2 and X

appear to do the right thing for this.

diff --git a/v7/src/edwin/buffrm.scm b/v7/src/edwin/buffrm.scm
index fc59a1e0b69b7aaa1b994f7fd418cc5b32d1c2b7..7a388bc5b0701a610734b26d9138f48292d545f0 100644 (file)
--- a/v7/src/edwin/buffrm.scm
+++ b/v7/src/edwin/buffrm.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: buffrm.scm,v 1.56 2000/01/10 03:59:32 cph Exp $
+;;; $Id: buffrm.scm,v 1.57 2000/01/16 13:23:42 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -313,9 +313,7 @@ Index 0 might contain \"^@\" so ascii NUL appears as ^@.
 The indices for normal printing characters usually contain a
 string containing just that character, e.g. index 65 usually contains \"A\".
 Automatically becomes local when set in any fashion."
-  (if (eq? 'NT microcode-id/operating-system)
-      default-char-image-strings/ansi
-      default-char-image-strings)
+  default-char-image-strings
   (lambda (object)
     (and (vector? object)
         (= (vector-length object) 256)

diff --git a/v7/src/edwin/dos.scm b/v7/src/edwin/dos.scm
index 0de0a8ad3d35059bba45d9d204ab17129ddf4b9a..9b06eedf1c3c05435051930a7518207fba3353af 100644 (file)
--- a/v7/src/edwin/dos.scm
+++ b/v7/src/edwin/dos.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: dos.scm,v 1.50 2000/01/10 03:23:27 cph Exp $
+;;; $Id: dos.scm,v 1.51 2000/01/16 13:24:07 cph Exp $
 ;;;
 ;;; Copyright (c) 1992-2000 Massachusetts Institute of Technology
 ;;;
@@ -66,9 +66,6 @@
                 (lambda (entry)
                   (fix:= (fix:and (file-attributes/modes (cdr entry)) mask)
                          0))))))))
-
-(define (os/default-char-image-strings)
-  default-char-image-strings/ansi)
 \f
 ;;;; Win32 Clipboard Interface
 

diff --git a/v7/src/edwin/image.scm b/v7/src/edwin/image.scm
index dc04d8c61de1e76d4f6f074a990467b231b84e1f..2c2e1c672409f4cee5354d7ecb1b107bc5e5e08b 100644 (file)
--- a/v7/src/edwin/image.scm
+++ b/v7/src/edwin/image.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: image.scm,v 1.135 2000/01/10 03:24:46 cph Exp $
+;;; $Id: image.scm,v 1.136 2000/01/16 13:24:02 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -72,7 +72,7 @@
                                       (vector-8b-ref string index))))))
          ((fix:= index end) column))))
 \f
-(define default-char-image-strings
+(define default-char-image-strings/original-emacs
   (let ((strings (make-vector 256)))
     (do ((i #x00 (+ i 1)))
        ((= #x20 i))
@@ -87,14 +87,14 @@
     strings))
 
 (define default-char-image-strings/ansi
-  (let ((strings (vector-copy default-char-image-strings)))
+  (let ((strings (vector-copy default-char-image-strings/original-emacs)))
     (do ((i #x80 (+ i 1)))
        ((= #x100 i))
       (vector-set! strings i (string (integer->char i))))
     strings))
 
 (define default-char-image-strings/ascii
-  (let ((strings (vector-copy default-char-image-strings)))
+  (let ((strings (vector-copy default-char-image-strings/original-emacs)))
     (subvector-move-left!
      '#("[NUL]" "[SOH]" "[STX]" "[ETX]" "[EOT]" "[ENQ]" "[ACK]" "[BEL]"
        "[BS]"  "[HT]"  "[NL]"  "[VT]" "[FF]" "[CR]"  "[SO]"  "[SI]"
@@ -102,6 +102,8 @@
        "[CAN]" "[EM]"  "[SUB]" "[ESC]" "[FS]"  "[GS]"  "[RS]"  "[US]")
      0 #x20 strings 0)
     strings))
+
+(define default-char-image-strings default-char-image-strings/ansi)
 \f
 (define (group-line-columns group start end column
                            tab-width char-image-strings)

diff --git a/v7/src/edwin/os2.scm b/v7/src/edwin/os2.scm
index d77f42491ef415f556e9bd8169bf1ffbc1432312..62becbe5af30714cb7fc24e6d6dd878e17d8c8c9 100644 (file)
--- a/v7/src/edwin/os2.scm
+++ b/v7/src/edwin/os2.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: os2.scm,v 1.47 2000/01/10 03:23:33 cph Exp $
+;;; $Id: os2.scm,v 1.48 2000/01/16 13:24:14 cph Exp $
 ;;;
 ;;; Copyright (c) 1994-2000 Massachusetts Institute of Technology
 ;;;
@@ -55,9 +55,6 @@
                (if attr
                    (cons (cons (file-namestring (car pathnames)) attr) result)
                    result))))))
-
-(define (os/default-char-image-strings)
-  default-char-image-strings)
 \f
 ;;;; OS/2 Clipboard Interface
 

diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index ea2fee55f295022f525eb628d5ddb1b863db5cb5..a8629147a1ae9baf49e367613e04c663a249ff2f 100644 (file)
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: unix.scm,v 1.104 2000/01/10 03:23:37 cph Exp $
+;;; $Id: unix.scm,v 1.105 2000/01/16 13:24:11 cph Exp $
 ;;;
 ;;; Copyright (c) 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -667,7 +667,4 @@ option, instead taking -P <filename>."
   (list "/usr/local/lib/info"
        "/usr/local/info"
        "/usr/share/info"
-       "/usr/info"))
-
-(define (os/default-char-image-strings)
-  default-char-image-strings)
\ No newline at end of file
+       "/usr/info"))
\ No newline at end of file