This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./configure.ac.orig 2017-09-12 01:55:00.000000000 +0900 | |
+++ ./configure.ac 2017-09-13 21:00:13.353677900 +0900 | |
@@ -2382,7 +2382,7 @@ | |
### Use -lrsvg-2 if available, unless '--with-rsvg=no' is specified. | |
HAVE_RSVG=no | |
-if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then | |
+if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then | |
if test "${with_rsvg}" != "no"; then | |
RSVG_REQUIRED=2.11.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/w32fns.c.orig 2017-04-15 00:02:47.000000000 +0900 | |
+++ ./src/w32fns.c 2017-09-13 21:00:14.888905300 +0900 | |
@@ -78,6 +78,8 @@ | |
extern const char *map_w32_filename (const char *, const char **); | |
extern char * w32_strerror (int error_no); | |
+static int ime_disabled = 0; | |
+ | |
#ifndef IDC_HAND | |
#define IDC_HAND MAKEINTRESOURCE(32649) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./lisp/image-mode.el.orig 2017-04-15 00:02:47.000000000 +0900 | |
+++ ./lisp/image-mode.el 2017-09-13 21:00:16.398061300 +0900 | |
@@ -680,9 +680,12 @@ | |
(edges (and (null image-transform-resize) | |
(window-inside-pixel-edges | |
(get-buffer-window (current-buffer))))) | |
+ (type (image-type file-or-data nil data-p)) | |
(type (if (fboundp 'imagemagick-types) | |
- 'imagemagick | |
- (image-type file-or-data nil data-p))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./lisp/loadup.el.orig 2017-04-15 00:02:47.000000000 +0900 | |
+++ ./lisp/loadup.el 2017-10-06 21:05:28.835848400 +0900 | |
@@ -271,6 +271,7 @@ | |
(load "term/w32-win") | |
(load "disp-table") | |
(when (eq system-type 'windows-nt) | |
+ (load "image") | |
(load "w32-fns") | |
(load "ls-lisp") | |
(load "dos-w32")))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
※以下は emacs-26 プレテスト前のものなので現在では内容が古くなっているかもしれません。 | |
emacs-26(以降)の README.txt も参照してみてください。 | |
■各パッチについて | |
emacs-25.3-*.diff は emacs-25.3 に対するパッチです。 | |
GNU emacs(x64) (http://hp.vector.co.jp/authors/VA052357/emacs.html) | |
の追加機能の主なものを切り出したものと自作のものをいくつか。 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/w32fns.c.orig 2017-04-15 00:02:47.000000000 +0900 | |
+++ ./src/w32fns.c 2017-09-13 21:00:22.787460000 +0900 | |
@@ -9944,6 +9944,9 @@ | |
{ | |
HMODULE imm32_lib = GetModuleHandle ("imm32.dll"); | |
+ BOOL (WINAPI * disable_ime_fn) (DWORD) = (BOOL (WINAPI *) (DWORD)) | |
+ GetProcAddress (imm32_lib, "ImmDisableIME"); | |
+ if (disable_ime_fn) disable_ime_fn (-1); | |
get_composition_string_fn = (ImmGetCompositionString_Proc) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./configure.ac.orig 2017-09-12 01:55:00.000000000 +0900 | |
+++ ./configure.ac 2017-09-13 21:00:32.623281500 +0900 | |
@@ -346,6 +346,10 @@ | |
On by default on macOS.])],[],[with_ns=maybe]) | |
OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build]) | |
+OPTION_DEFAULT_ON([w32-ime], [don't compile with W32-IME support]) | |
+OPTION_DEFAULT_ON([reconversion], [don't compile with RECONVERSION support]) | |
+OPTION_DEFAULT_ON([documentfeed], [don't compile with DOCUMENTFEED support]) | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./configure.ac.orig 2018-04-05 18:55:25.000000000 +0900 | |
+++ ./configure.ac 2018-04-10 23:10:26.376568600 +0900 | |
@@ -379,6 +379,8 @@ | |
OPTION_DEFAULT_OFF([modules],[compile with dynamic modules support]) | |
OPTION_DEFAULT_ON([threads],[don't compile with elisp threading support]) | |
+OPTION_DEFAULT_ON([cmigemo], [don't compile with CMIGEMO support]) | |
+ | |
AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB], | |
[use a file notification library (LIB one of: yes, inotify, kqueue, gfile, w32, no)])], |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./configure.ac.orig 2018-04-05 18:55:25.000000000 +0900 | |
+++ ./configure.ac 2018-04-10 23:10:34.731914900 +0900 | |
@@ -2498,7 +2498,7 @@ | |
### Use -lrsvg-2 if available, unless '--with-rsvg=no' is specified. | |
HAVE_RSVG=no | |
-if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then | |
+if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then | |
if test "${with_rsvg}" != "no"; then | |
RSVG_REQUIRED=2.11.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- ./src/w32fns.c.orig 2018-01-09 05:23:58.000000000 +0900 | |
+++ ./src/w32fns.c 2018-04-10 23:10:35.912507500 +0900 | |
@@ -79,6 +79,8 @@ | |
extern void w32_free_menu_strings (HWND); | |
extern const char *map_w32_filename (const char *, const char **); | |
+static int ime_disabled = 0; | |
+ | |
#ifndef IDC_HAND | |
#define IDC_HAND MAKEINTRESOURCE(32649) |