ref: 800f5096c1c191e11239a9cf9e62a0dec49929bb
parent: cbc9938e68fe74d19a4936c017183e84cbaeda79
author: Werner Lemberg <[email protected]>
date: Tue Apr 10 09:59:58 EDT 2001
* src/pcf/pcfdriver.c (PCF_Get_Char_Index): Fix return value. * builds/dos/detect.mk: Add support for bash.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-10 Francesco Zappa Nardelli <[email protected]>
+
+ * src/pcf/pcfdriver.c (PCF_Get_Char_Index): Fix return value.
+
+2001-04-09 Laurence Withers <[email protected]>
+
+ * builds/dos/detect.mk: Add support for bash.
+
2001-04-05 Werner Lemberg <[email protected]>
* builds/os2/*.mk: These files have been forgotten to update to
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -40,7 +40,7 @@
# 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 @@
endif # test PLATFORM ansi
ifeq ($(PLATFORM),dos)
- DELETE := del
- COPY := copy
# Use DJGPP (i.e. gcc) by default.
#
@@ -98,7 +96,15 @@
.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
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -264,7 +264,7 @@
return en_table[mid].glyph;
}
- return face->defaultChar;
+ return 0;
}