Commit 800f5096c1c191e11239a9cf9e62a0dec49929bb
2001-04-10T13:59:58
* src/pcf/pcfdriver.c (PCF_Get_Char_Index): Fix return value. * builds/dos/detect.mk: Add support for bash.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/ChangeLog b/ChangeLog
index 5078cb4..2284b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-10 Francesco Zappa Nardelli <francesco.zappa.nardelli@ens.fr>
+
+ * src/pcf/pcfdriver.c (PCF_Get_Char_Index): Fix return value.
+
+2001-04-09 Laurence Withers <lwithers@lwithers.demon.co.uk>
+
+ * builds/dos/detect.mk: Add support for bash.
+
2001-04-05 Werner Lemberg <wl@gnu.org>
* builds/os2/*.mk: These files have been forgotten to update to
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index 65eb42d..a325b99 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -40,7 +40,7 @@ ifeq ($(PLATFORM),ansi)
# substring `MDOS\COMMAND'
#
ifeq ($(is_dos),)
- is_dos := $(findstring MDOS\COMMAND,$(COMSPEC))
+ is_dos := $(findstring MDOS\COMMAND,$(COMSPEC))
endif
endif # test COMSPEC
@@ -53,8 +53,6 @@ ifeq ($(PLATFORM),ansi)
endif # test PLATFORM ansi
ifeq ($(PLATFORM),dos)
- DELETE := del
- COPY := copy
# Use DJGPP (i.e. gcc) by default.
#
@@ -98,7 +96,15 @@ ifeq ($(PLATFORM),dos)
.PHONY: borlandc
endif
- setup: dos_setup
+ ifneq ($(findstring bash,$(SHELL)),) # check for bash
+ DELETE := rm
+ COPY := cp
+ setup: std_setup
+ else
+ DELETE := del
+ COPY := copy
+ setup: dos_setup
+ endif
endif # test PLATFORM dos
diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c
index beb8f55..18d4fff 100644
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -264,7 +264,7 @@ THE SOFTWARE.
return en_table[mid].glyph;
}
- return face->defaultChar;
+ return 0;
}