remove HANDLE_OE_DIPTHONG

diff --git a/Makefile b/Makefile
index 5fbc84a057fbfc8f8a1f6d1ce35bdbfac09af89b..dd918926a1d99c05efeff2fdd4f11e1e6526db82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,6 @@ DEFAULT_CONVERTER ?= SRC_SINC_MEDIUM_QUALITY
 # Comment this out if you don't want UTF-8 support
 USE_UTF8 ?= yes
 
-# The OE dipthong is not a latin1 character, but it seems the zmachine
-# can handle it, and it is tested for in terpetude.  Comment this out
-# if you don't want to support the OE dipthong
-HANDLE_OE_DIPTHONG ?= yes
-
 # Comment this out if your machine's version of curses doesn't support color.
 COLOR ?= yes
 
@@ -265,9 +260,6 @@ endif
 ifdef NO_STRDUP
        @echo "#define NO_STRDUP" >> $@
 endif
-ifdef HANDLE_OE_DIPTHONG
-       @echo "#define HANDLE_OE_DIPTHONG" >> $@
-endif
 ifeq ($(USE_UTF8), yes)
        @echo "#define USE_UTF8" >> $@
 endif
@@ -295,9 +287,6 @@ ifdef COLOR
 endif
 ifeq ($(USE_UTF8), yes)
        @echo "#define USE_UTF8" >> $@
-endif
-ifdef HANDLE_OE_DIPTHONG
-       @echo "#define HANDLE_OE_DIPTHONG" >> $@
 endif
        @echo "#endif /* CURSES_DEFINES_H */" >> $@
 

diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c
index f92126854cd9e5b255dbc0cfd6b56f1df4c6ae6a..cd5a94fd5db39dc7ccbb28ec6f5fbe34ce56d877 100644 (file)
--- a/src/curses/ux_input.c
+++ b/src/curses/ux_input.c
@@ -201,19 +201,6 @@ static int unix_read_char(int extkeys)
            return c;
 
        /* ...and the other 2% makes up 98% of the code. :( */
-#ifdef HANDLE_OE_DIPTHONG
-       if (c == 0x153)
-       {
-           /* oe dipthong */
-           return 0xf6;
-       }
-       if (c == 0x152)
-       {
-           /* OE dipthong */
-           return 0xd6;
-       }
-#endif
-
 #ifdef USE_UTF8
     if (sel != KEY_CODE_YES && c >= ZC_LATIN1_MIN)
         return c;