Mercurial > hg > xemacs-beta
changeset 5940:c608d4b0b75e cygwin64 tip
rescue lost branch from 64bit.backup
| author | Henry Thompson <ht@markup.co.uk> |
|---|---|
| date | Thu, 16 Dec 2021 18:48:58 +0000 |
| parents | 2f34b59f451a |
| children | |
| files | lisp/code-init.el lisp/dumped-lisp.el lisp/menubar-items.el lisp/mule/mule-cmds.el lisp/sound.el notes.txt nt/xemacs.mak src/s/windowsnt.h tests/automated/os-tests.el |
| diffstat | 9 files changed, 24 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/code-init.el Fri Jul 24 14:48:46 2015 +0100 +++ b/lisp/code-init.el Thu Dec 16 18:48:58 2021 +0000 @@ -35,7 +35,7 @@ (defcustom eol-detection-enabled-p (or (featurep 'mule) (memq system-type '(windows-nt - cygwin32)) + cygwin32 cygwin64)) (featurep 'unix-default-eol-detection)) "True if XEmacs automatically detects the EOL type when reading files. Normally, this is always the case on Windows or when international (Mule) @@ -71,7 +71,7 @@ (defun coding-system-current-system-configuration () "Function to decide which default coding system configuration applies." (cond ((featurep 'cygwin-use-utf-8) 'cygwin-utf-8) - ((memq system-type '(windows-nt cygwin32)) + ((memq system-type '(windows-nt cygwin32 cygwin64)) (if (featurep 'mule) 'windows-mule 'windows-no-mule)) ((featurep 'mule) 'mule) (eol-detection-enabled-p 'no-mule-eol-detection)
--- a/lisp/dumped-lisp.el Fri Jul 24 14:48:46 2015 +0100 +++ b/lisp/dumped-lisp.el Thu Dec 16 18:48:58 2021 +0000 @@ -180,7 +180,7 @@ ;; may initialize coding systems (when (featurep '(and mule x)) "mule/mule-x-init") (when (featurep '(and mule tty)) "mule/mule-tty-init") - (when (and (featurep 'mule) (memq system-type '(windows-nt cygwin32))) + (when (and (featurep 'mule) (memq system-type '(windows-nt cygwin32 cygwin64))) "mule/mule-win32-init") "code-init" ; set up defaults ;; All files after this can have extended characters in them.
--- a/lisp/menubar-items.el Fri Jul 24 14:48:46 2015 +0100 +++ b/lisp/menubar-items.el Thu Dec 16 18:48:58 2021 +0000 @@ -954,7 +954,7 @@ (not eol-detection-enabled-p)) :style toggle :selected eol-detection-enabled-p - :included (not (memq system-type '(windows-nt cygwin32)))] + :included (not (memq system-type '(windows-nt cygwin32 cygwin64)))] ("Set Coding System of %_Buffer File" :filter ,#'(lambda (menu)
--- a/lisp/mule/mule-cmds.el Fri Jul 24 14:48:46 2015 +0100 +++ b/lisp/mule/mule-cmds.el Thu Dec 16 18:48:58 2021 +0000 @@ -1305,7 +1305,7 @@ ;; that follow Unix conventions, but also MS Windows locales. ;; So set the MS Windows locale, and then try to find a Unix ;; locale. - (when (eq system-type 'cygwin32) + (when (memq system-type '(cygwin32 cygwin64)) (mswindows-get-and-set-locale-from-langenv langenv)) (let ((locs (get-language-info langenv 'locale))) (dolist (loc (if (listp locs) locs (list locs))) @@ -1380,7 +1380,7 @@ ;; to edit ~/.xemacs/init.el. Aidan Kehoe, Sun Nov 26 18:11:31 CET ;; 2006. OS X uses an almost-normal-form version of UTF-8. - (unless (memq system-type '(windows-nt cygwin32)) + (unless (memq system-type '(windows-nt cygwin32 cygwin64)) (set-default-buffer-file-coding-system (maybe-change-coding-system-with-eol default-coding eol-type)))) ;; (setq default-sendmail-coding-system default-coding) @@ -1452,7 +1452,7 @@ (let (langenv) ;; under ms windows (any): - (if (memq system-type '(windows-nt cygwin32)) + (if (memq system-type '(windows-nt cygwin32 cygwin64)) (let ((userdef (declare-fboundp (mswindows-user-default-locale))) (sysdef (declare-fboundp (mswindows-system-default-locale)))) ;; (1) current langenv comes from user-default locale.
--- a/lisp/sound.el Fri Jul 24 14:48:46 2015 +0100 +++ b/lisp/sound.el Thu Dec 16 18:48:58 2021 +0000 @@ -105,9 +105,8 @@ :type 'directory ) -;; #### This should really be a list. --hniksic -(defcustom sound-extension-list (cond ((or (eq system-type 'cygwin32) - (eq system-type 'windows-nt)) +;; #### This should really be a list. --hniksic -- now it is --hst :-) +(defcustom sound-extension-list (cond ((memq system-type '(cygwin32 cygwin64 windows-nt)) ".wav:") ((eq system-type 'linux) ".wav:.au:")
--- a/notes.txt Fri Jul 24 14:48:46 2015 +0100 +++ b/notes.txt Thu Dec 16 18:48:58 2021 +0000 @@ -308,3 +308,5 @@ src/specifier.c src/toolbar-msw.c src/win32.c +This version works with cygwin, is in /usr/local/bin as of 28 July. +Subsequent edits are pbly abandoned rework of the cygwin/cygwin32/cygwin64 switch
--- a/nt/xemacs.mak Fri Jul 24 14:48:46 2015 +0100 +++ b/nt/xemacs.mak Thu Dec 16 18:48:58 2021 +0000 @@ -72,12 +72,12 @@ !endif !endif -!if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh] -!endif -!if exist($(SRCROOT)\.hg) -!if [hg identify >> $(SRCROOT)\version.sh] -!endif -!endif +#!if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh] +#!endif +#!if exist($(SRCROOT)\.hg) +#!if [hg identify >> $(SRCROOT)\version.sh] +#!endif +#!endif # Program name and version !include "$(SRCROOT)\version.sh" @@ -738,10 +738,10 @@ !if $(USE_CRTDLL) ! if $(DEBUG_XEMACS) && "$(OK_TO_USE_MSVCRTD)" == "1" C_LIBFLAG=-MDd -LIBC_LIB=msvcrtd.lib +LIBC_LIB=msvcrtd.lib ucrtd.lib vcruntimed.lib ! else C_LIBFLAG=-MD -LIBC_LIB=msvcrt.lib +LIBC_LIB=msvcrt.lib ucrt.lib vcruntime.lib ! endif !else C_LIBFLAG=-ML @@ -793,7 +793,7 @@ INCLUDES=-I$(NT)\inc -I$(SRC) $(OPT_INCLUDES) DEFINES=$(OPT_DEFINES) \ - -DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K \ + -DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K -D_CRT_NO_POSIX_ERROR_CODES \ -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES) CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE)
--- a/src/s/windowsnt.h Fri Jul 24 14:48:46 2015 +0100 +++ b/src/s/windowsnt.h Thu Dec 16 18:48:58 2021 +0000 @@ -176,9 +176,11 @@ #pragma warning ( disable : 4646 ) #endif -/* MSVC version >= 2.x without /Za supports __inline */ +/* MSVC version >= 2.x without /Za supports __inline + HST cut this -- VS2015 complains #if (_MSC_VER < 900) || defined (__STDC__) # define inline #else # define inline __inline #endif +*/
--- a/tests/automated/os-tests.el Fri Jul 24 14:48:46 2015 +0100 +++ b/tests/automated/os-tests.el Thu Dec 16 18:48:58 2021 +0000 @@ -105,7 +105,7 @@ directory-sep-char directory-sep-char envvar-existing-val)) - (if (memq system-type '(windows-nt cygwin32)) + (if (memq system-type '(windows-nt cygwin32 cygwin64)) '("//network-path/c$" "//network-path/c$") '("/network-path/c$" "/network-path/c$")) (list (format "/home/whoever/$%s" envvar-not-existing)