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.el.orig 2015-02-02 02:27:17.000000000 +0900 | |
+++ ./lisp/image.el 2015-04-11 07:30:10.847912500 +0900 | |
@@ -126,6 +126,15 @@ | |
:type '(repeat (choice directory variable)) | |
:initialize 'custom-initialize-delay) | |
+;;;###autoload | |
+(defcustom image-fit-option-alist nil | |
+ "Alist of (IMAGE-TYPE . FIT-OPTION) pairs used by image loader to specify image size. | |
+the FIT-OPTION is one of 'never, 'frame, 'width-or-height, 'width or 'height. |
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 2015-04-02 16:23:06.000000000 +0900 | |
+++ ./configure.ac 2015-04-11 07:31:33.786673500 +0900 | |
@@ -2236,7 +2236,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
※以下は emacs-25 リリース前のものなので現在では内容が古くなっているかもしれません。 | |
emacs-25(以降)の README.txt も参照してみてください。 | |
■各パッチについて | |
emacs-24.5-*.diff は emacs-24.5 に対するパッチです。 | |
□emacs-24.5-x64.diff (https://gist.github.com/rzl24ozi/68c29ac4fe64f1aa8887) | |
GNU emacs(x64) (http://hp.vector.co.jp/authors/VA052357/emacs.html) | |
に同梱のパッチ | |
(GNU emacs(x64) インストール後に C:\Program Files\GNU\Emacs23\distfiles\ |
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 2015-04-02 16:23:06.000000000 +0900 | |
+++ ./configure.ac 2015-04-11 07:28:36.226147400 +0900 | |
@@ -263,6 +263,10 @@ | |
OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system]) | |
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 2015-04-02 16:23:06.000000000 +0900 | |
+++ ./configure.ac 2015-04-11 07:29:31.587123600 +0900 | |
@@ -2269,9 +2269,13 @@ | |
if test $HAVE_IMAGEMAGICK = yes; then | |
AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) | |
+ OLD_CFLAGS=$CFLAGS | |
+ OLD_LIBS=$LIBS | |
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" | |
LIBS="$IMAGEMAGICK_LIBS $LIBS" |
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 2015-04-02 16:23:06.000000000 +0900 | |
+++ ./src/w32fns.c 2015-04-11 07:30:51.510841300 +0900 | |
@@ -89,6 +89,8 @@ | |
extern const char *map_w32_filename (const char *, const char **); | |
extern char * w32_strerror (int error_no); | |
+static int ime_disabled = 0; | |
+ | |
/* If non-NULL, a handle to a frame where to display the hourglass cursor. */ | |
static HWND hourglass_hwnd = NULL; |
NewerOlder