• R/O
  • SSH
  • HTTPS

macemacsjp: 提交


Commit MetaInfo

修订版576 (tree)
时间2011-12-05 17:04:22
作者taiichi

Log Message

(empty log message)

更改概述

差异

--- inline_patch/trunk/lion.patch (nonexistent)
+++ inline_patch/trunk/lion.patch (revision 576)
@@ -0,0 +1,54 @@
1+diff -r -p -N -x '*.o' ../emacs-23.3-0/src/nsterm.m src/nsterm.m
2+*** ../emacs-23.3-0/src/nsterm.m 2011-02-09 08:46:22.000000000 +0900
3+--- src/nsterm.m 2011-12-05 16:50:06.000000000 +0900
4+*************** ns_term_shutdown (int sig)
5+*** 5106,5112 ****
6+
7+ win = [[EmacsWindow alloc]
8+ initWithContentRect: r
9+! styleMask: (NSResizableWindowMask |
10+ NSMiniaturizableWindowMask |
11+ NSClosableWindowMask)
12+ backing: NSBackingStoreBuffered
13+--- 5106,5113 ----
14+
15+ win = [[EmacsWindow alloc]
16+ initWithContentRect: r
17+! styleMask: (NSTitledWindowMask |
18+! NSResizableWindowMask |
19+ NSMiniaturizableWindowMask |
20+ NSClosableWindowMask)
21+ backing: NSBackingStoreBuffered
22+diff -r -p -N -x '*.o' ../emacs-23.3-0/src/s/darwin.h src/s/darwin.h
23+*** ../emacs-23.3-0/src/s/darwin.h 2011-01-09 02:45:14.000000000 +0900
24+--- src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900
25+*************** along with GNU Emacs. If not, see <http
26+*** 181,187 ****
27+ end of the header for adding load commands. Needed for dumping.
28+ 0x690 is the total size of 30 segment load commands (at 56
29+ each); under Cocoa 31 commands are required. */
30+! #define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
31+
32+ #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
33+
34+--- 181,187 ----
35+ end of the header for adding load commands. Needed for dumping.
36+ 0x690 is the total size of 30 segment load commands (at 56
37+ each); under Cocoa 31 commands are required. */
38+! #define LD_SWITCH_SYSTEM_TEMACS -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
39+
40+ #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
41+
42+diff -r -p -N -x '*.o' ../emacs-23.3-0/src/unexmacosx.c src/unexmacosx.c
43+*** ../emacs-23.3-0/src/unexmacosx.c 2011-01-09 02:45:14.000000000 +0900
44+--- src/unexmacosx.c 2011-12-05 16:49:51.000000000 +0900
45+*************** copy_data_segment (struct load_command *
46+*** 822,827 ****
47+--- 822,828 ----
48+ }
49+ else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
50+ || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
51++ || strncmp (sectp->sectname, "__got", 16) == 0
52+ || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
53+ || strncmp (sectp->sectname, "__dyld", 16) == 0
54+ || strncmp (sectp->sectname, "__const", 16) == 0
Show on old repository browser