(メッセージはありません)
@@ -1,6 +1,6 @@ | ||
1 | 1 | diff -r -p -x '*.elc' ../emacs-23.3-0-lion/lisp/term/ns-win.el lisp/term/ns-win.el |
2 | 2 | *** ../emacs-23.3-0-lion/lisp/term/ns-win.el 2011-12-05 16:49:13.000000000 +0900 |
3 | ---- lisp/term/ns-win.el 2011-12-04 17:01:12.000000000 +0900 | |
3 | +--- lisp/term/ns-win.el 2012-01-13 08:55:10.000000000 +0900 | |
4 | 4 | *************** The properties returned may include `top |
5 | 5 | *** 317,322 **** |
6 | 6 | --- 317,323 ---- |
@@ -171,7 +171,7 @@ | ||
171 | 171 | ;; Still alive? |
172 | 172 | *************** the operating system.") |
173 | 173 | *** 1267,1272 **** |
174 | ---- 1345,1731 ---- | |
174 | +--- 1345,1771 ---- | |
175 | 175 | (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system)) |
176 | 176 | |
177 | 177 |
@@ -355,6 +355,46 @@ | ||
355 | 355 | + (title . "半英") |
356 | 356 | + (cursor-color) |
357 | 357 | + (cursor-type)) |
358 | ++ ("com.justsystems.inputmethod.atok23.Roman" | |
359 | ++ (title . "A") | |
360 | ++ (cursor-color) | |
361 | ++ (cursor-type)) | |
362 | ++ ("com.justsystems.inputmethod.atok23.Japanese" | |
363 | ++ (title . "あ") | |
364 | ++ (cursor-color) | |
365 | ++ (cursor-type)) | |
366 | ++ ("com.justsystems.inputmethod.atok23.Japanese.Katakana" | |
367 | ++ (title . "ア") | |
368 | ++ (cursor-color) | |
369 | ++ (cursor-type)) | |
370 | ++ ("com.justsystems.inputmethod.atok23.Japanese.FullWidthRoman" | |
371 | ++ (title . "英") | |
372 | ++ (cursor-color) | |
373 | ++ (cursor-type)) | |
374 | ++ ("com.justsystems.inputmethod.atok23.Japanese.HalfWidthEiji" | |
375 | ++ (title . "半英") | |
376 | ++ (cursor-color) | |
377 | ++ (cursor-type)) | |
378 | ++ ("com.justsystems.inputmethod.atok24.Roman" | |
379 | ++ (title . "A") | |
380 | ++ (cursor-color) | |
381 | ++ (cursor-type)) | |
382 | ++ ("com.justsystems.inputmethod.atok24.Japanese" | |
383 | ++ (title . "あ") | |
384 | ++ (cursor-color) | |
385 | ++ (cursor-type)) | |
386 | ++ ("com.justsystems.inputmethod.atok24.Japanese.Katakana" | |
387 | ++ (title . "ア") | |
388 | ++ (cursor-color) | |
389 | ++ (cursor-type)) | |
390 | ++ ("com.justsystems.inputmethod.atok24.Japanese.FullWidthRoman" | |
391 | ++ (title . "英") | |
392 | ++ (cursor-color) | |
393 | ++ (cursor-type)) | |
394 | ++ ("com.justsystems.inputmethod.atok24.Japanese.HalfWidthEiji" | |
395 | ++ (title . "半英") | |
396 | ++ (cursor-color) | |
397 | ++ (cursor-type)) | |
358 | 398 | + ) |
359 | 399 | + "Alist of Mac script code vs parameters for input method on MacOSX.") |
360 | 400 | + |
@@ -561,7 +601,7 @@ | ||
561 | 601 | ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644 |
562 | 602 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/Makefile.in src/Makefile.in |
563 | 603 | *** ../emacs-23.3-0-lion/src/Makefile.in 2011-12-05 16:49:13.000000000 +0900 |
564 | ---- src/Makefile.in 2011-12-04 17:01:12.000000000 +0900 | |
604 | +--- src/Makefile.in 2012-01-13 08:53:57.000000000 +0900 | |
565 | 605 | *************** ns_appresdir=@ns_appresdir@/ |
566 | 606 | *** 545,551 **** |
567 | 607 | ns_appsrc=@ns_appsrc@ |
@@ -608,7 +648,7 @@ | ||
608 | 648 | blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ |
609 | 649 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/keyboard.c src/keyboard.c |
610 | 650 | *** ../emacs-23.3-0-lion/src/keyboard.c 2011-12-05 16:49:13.000000000 +0900 |
611 | ---- src/keyboard.c 2011-12-04 17:01:12.000000000 +0900 | |
651 | +--- src/keyboard.c 2012-01-13 08:53:57.000000000 +0900 | |
612 | 652 | *************** kbd_buffer_get_event (kbp, used_mouse_me |
613 | 653 | *** 4243,4250 **** |
614 | 654 | { |
@@ -643,7 +683,7 @@ | ||
643 | 683 | But `handle-switch-frame is not run from the special-map. |
644 | 684 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/macim.m src/macim.m |
645 | 685 | *** ../emacs-23.3-0-lion/src/macim.m 1970-01-01 09:00:00.000000000 +0900 |
646 | ---- src/macim.m 2011-12-04 17:01:12.000000000 +0900 | |
686 | +--- src/macim.m 2012-01-13 08:53:57.000000000 +0900 | |
647 | 687 | *************** |
648 | 688 | *** 0 **** |
649 | 689 | --- 1,178 ---- |
@@ -827,7 +867,7 @@ | ||
827 | 867 | + #endif |
828 | 868 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsfns.m src/nsfns.m |
829 | 869 | *** ../emacs-23.3-0-lion/src/nsfns.m 2011-12-05 16:49:13.000000000 +0900 |
830 | ---- src/nsfns.m 2011-12-04 17:01:12.000000000 +0900 | |
870 | +--- src/nsfns.m 2012-01-13 08:53:57.000000000 +0900 | |
831 | 871 | *************** Lisp_Object Fx_open_connection (Lisp_Obj |
832 | 872 | *** 103,108 **** |
833 | 873 | --- 103,113 ---- |
@@ -884,7 +924,7 @@ | ||
884 | 924 | |
885 | 925 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.h src/nsterm.h |
886 | 926 | *** ../emacs-23.3-0-lion/src/nsterm.h 2011-12-05 16:49:13.000000000 +0900 |
887 | ---- src/nsterm.h 2011-12-04 17:01:12.000000000 +0900 | |
927 | +--- src/nsterm.h 2012-01-13 08:53:57.000000000 +0900 | |
888 | 928 | *************** typedef unsigned int NSUInteger; |
889 | 929 | *** 365,370 **** |
890 | 930 | --- 365,372 ---- |
@@ -898,7 +938,7 @@ | ||
898 | 938 | for managing a table of bitmap "records" */ |
899 | 939 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/nsterm.m src/nsterm.m |
900 | 940 | *** ../emacs-23.3-0-lion/src/nsterm.m 2011-12-05 16:50:06.000000000 +0900 |
901 | ---- src/nsterm.m 2011-12-05 17:51:07.000000000 +0900 | |
941 | +--- src/nsterm.m 2012-01-13 08:53:57.000000000 +0900 | |
902 | 942 | *************** ns_term_init (Lisp_Object display_name) |
903 | 943 | *** 3730,3735 **** |
904 | 944 | --- 3730,3738 ---- |
@@ -1090,7 +1130,7 @@ | ||
1090 | 1130 | pt = [[self window] convertBaseToScreen: pt]; |
1091 | 1131 | diff -r -p -N -x '*.o' ../emacs-23.3-0-lion/src/s/darwin.h src/s/darwin.h |
1092 | 1132 | *** ../emacs-23.3-0-lion/src/s/darwin.h 2011-12-05 16:49:29.000000000 +0900 |
1093 | ---- src/s/darwin.h 2011-12-04 17:01:12.000000000 +0900 | |
1133 | +--- src/s/darwin.h 2012-01-13 08:53:57.000000000 +0900 | |
1094 | 1134 | *************** along with GNU Emacs. If not, see <http |
1095 | 1135 | *** 163,169 **** |
1096 | 1136 | /* Definitions for how to compile & link. */ |