From 69456b56b81c827c35bb65636e36e4d4520dcc91 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 16 Jan 2000 13:24:14 +0000
Subject: [PATCH] Use ANSI char images for all operating systems.  Both OS/2
 and X appear to do the right thing for this.

---
 v7/src/edwin/buffrm.scm |  6 ++----
 v7/src/edwin/dos.scm    |  5 +----
 v7/src/edwin/image.scm  | 10 ++++++----
 v7/src/edwin/os2.scm    |  5 +----
 v7/src/edwin/unix.scm   |  7 ++-----
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/v7/src/edwin/buffrm.scm b/v7/src/edwin/buffrm.scm
index fc59a1e0b..7a388bc5b 100644
--- 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 0de0a8ad3..9b06eedf1 100644
--- 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)
 
 ;;;; Win32 Clipboard Interface
 
diff --git a/v7/src/edwin/image.scm b/v7/src/edwin/image.scm
index dc04d8c61..2c2e1c672 100644
--- 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))))
 
-(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)
 
 (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 d77f42491..62becbe5a 100644
--- 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)
 
 ;;;; OS/2 Clipboard Interface
 
diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index ea2fee55f..a8629147a 100644
--- 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
-- 
2.25.1