diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-29 10:12:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-29 10:12:12 (GMT) |
| commit | 4bd227bc12b1ef9858d4bcabb100b79a3da8fdd6 (patch) | |
| tree | 77052a1b04cfbe94d67b034868a6b6d1fd59091d | |
| parent | 15ca940ca7c564de29ebeeca34c8140599a831e8 (diff) | |
| parent | 84e92af6dc25e59e12d8f7ad4b12016464e030d2 (diff) | |
| download | tcl-4bd227bc12b1ef9858d4bcabb100b79a3da8fdd6.zip tcl-4bd227bc12b1ef9858d4bcabb100b79a3da8fdd6.tar.gz tcl-4bd227bc12b1ef9858d4bcabb100b79a3da8fdd6.tar.bz2 | |
Make sure that "string is space \u202f" will continue to return "1", even if in future Unicode this character (NARROW_NO_BREAK_SPACE) will cease to be a space. See: [http://www.unicode.org/review/pri249/].
Don't hardcode "tclWinError.o" for Cygwin
| -rw-r--r-- | generic/tclUtf.c | 2 | ||||
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/tcl.m4 | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index a349846..15529c7 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -1558,7 +1558,7 @@ Tcl_UniCharIsSpace( return TclIsSpaceProc((char) ch); } else if ((Tcl_UniChar) ch == 0x0085 || (Tcl_UniChar) ch == 0x180e || (Tcl_UniChar) ch == 0x200b || (Tcl_UniChar) ch == 0x2060 - || (Tcl_UniChar) ch == 0xfeff) { + || (Tcl_UniChar) ch == 0x202f || (Tcl_UniChar) ch == 0xfeff) { return 1; } else { return ((SPACE_BITS >> GetCategory(ch)) & 1); diff --git a/unix/Makefile.in b/unix/Makefile.in index 163f4b5..443e70d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -349,6 +349,8 @@ NOTIFY_OBJS = tclUnixNotfy.o MAC_OSX_OBJS = tclMacOSXBundle.o tclMacOSXFCmd.o tclMacOSXNotify.o +CYGWIN_OBJS = tclWinError.o + DTRACE_OBJ = tclDTrace.o ZLIB_OBJS = Zadler32.o Zcompress.o Zcrc32.o Zdeflate.o Zinfback.o \ @@ -578,6 +580,9 @@ MAC_OSX_SRCS = \ $(MAC_OSX_DIR)/tclMacOSXFCmd.c \ $(MAC_OSX_DIR)/tclMacOSXNotify.c +CYGWIN_SRCS = \ + $(TOP_DIR)/win/tclWinError.c + DTRACE_HDR = tclDTrace.h DTRACE_SRC = $(GENERIC_DIR)/tclDTrace.d diff --git a/unix/configure b/unix/configure index eac1b53..8779d7f 100755 --- a/unix/configure +++ b/unix/configure @@ -7070,7 +7070,8 @@ fi SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" DL_OBJS="tclLoadDl.o" - PLAT_OBJS="tclWinError.o" + PLAT_OBJS='${CYGWIN_OBJS}' + PLAT_SRCS='${CYGWIN_SRCS}' DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index dc5c16a..f12d0a8 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1225,7 +1225,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" DL_OBJS="tclLoadDl.o" - PLAT_OBJS="tclWinError.o" + PLAT_OBJS='${CYGWIN_OBJS}' + PLAT_SRCS='${CYGWIN_SRCS}' DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" |