(empty log message)
@@ -1,6 +1,5 @@ | ||
1 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/lisp/term/ns-win.el lisp/term/ns-win.el | |
2 | -*** ../emacs23-20090519-0/lisp/term/ns-win.el 2009-05-19 21:44:10.000000000 +0900 | |
3 | ---- lisp/term/ns-win.el 2009-05-22 23:08:10.000000000 +0900 | |
1 | +*** ../emacs23-20090617-0/lisp/term/ns-win.el 2009-06-17 17:09:50.000000000 +0900 | |
2 | +--- lisp/term/ns-win.el 2009-06-17 17:42:45.000000000 +0900 | |
4 | 3 | *************** The properties returned may include `top |
5 | 4 | *** 333,338 **** |
6 | 5 | --- 333,339 ---- |
@@ -11,9 +10,45 @@ | ||
11 | 10 | (cons (logior (lsh 1 16) 32) 'f1) |
12 | 11 | (cons (logior (lsh 1 16) 33) 'f2) |
13 | 12 | (cons (logior (lsh 1 16) 34) 'f3) |
13 | +*************** The overlay is assigned the face `ns-wor | |
14 | +*** 628,642 **** | |
15 | + (defun ns-echo-working-text () | |
16 | + "Echo contents of `ns-working-text' in message display area. | |
17 | + See `ns-insert-working-text'." | |
18 | +- (ns-delete-working-text) | |
19 | + (let* ((msg (current-message)) | |
20 | +! (msglen (length msg)) | |
21 | +! message-log-max) | |
22 | + (setq ns-working-overlay (length ns-working-text)) | |
23 | + (setq msg (concat msg ns-working-text)) | |
24 | + (put-text-property msglen (+ msglen ns-working-overlay) | |
25 | +! 'face 'ns-working-text-face msg) | |
26 | +! (message "%s" msg))) | |
27 | + | |
28 | + (defun ns-delete-working-text() | |
29 | + "Delete working text and clear `ns-working-overlay'." | |
30 | +--- 629,646 ---- | |
31 | + (defun ns-echo-working-text () | |
32 | + "Echo contents of `ns-working-text' in message display area. | |
33 | + See `ns-insert-working-text'." | |
34 | + (let* ((msg (current-message)) | |
35 | +! (msglen (length msg)) | |
36 | +! message-log-max) | |
37 | +! (if (integerp ns-working-overlay) | |
38 | +! (progn | |
39 | +! (setq msg (substring msg 0 (- (length msg) ns-working-overlay))) | |
40 | +! (setq msglen (length msg)))) | |
41 | + (setq ns-working-overlay (length ns-working-text)) | |
42 | + (setq msg (concat msg ns-working-text)) | |
43 | + (put-text-property msglen (+ msglen ns-working-overlay) | |
44 | +! 'face 'ns-working-text-face msg) | |
45 | +! (message "%s" msg))) | |
46 | + | |
47 | + (defun ns-delete-working-text() | |
48 | + "Delete working text and clear `ns-working-overlay'." | |
14 | 49 | *************** Note, tranparency works better on Tiger |
15 | -*** 1268,1273 **** | |
16 | ---- 1269,1489 ---- | |
50 | +*** 1255,1260 **** | |
51 | +--- 1259,1482 ---- | |
17 | 52 | (add-to-list 'window-system-initialization-alist '(ns . ns-initialize-window-system)) |
18 | 53 | |
19 | 54 |
@@ -124,7 +159,7 @@ | ||
124 | 159 | + (defun mac-change-language-to-us () |
125 | 160 | + "Function to change language (Apple Key Script) to us." |
126 | 161 | + (interactive) |
127 | -+ (mac-toggle-input-method nil)) | |
162 | ++ (mac-set-key-script -17)) | |
128 | 163 | + |
129 | 164 | + (defun mac-handle-input-method-change () |
130 | 165 | + "Function run when a input method change." |
@@ -163,7 +198,8 @@ | ||
163 | 198 | + (if mac-input-method-mode |
164 | 199 | + (progn |
165 | 200 | + (setq default-input-method "MacOSX") |
166 | -+ (add-hook 'minibuffer-setup-hook 'mac-change-language-to-us)) | |
201 | ++ (add-hook 'minibuffer-setup-hook 'mac-change-language-to-us) | |
202 | ++ (mac-translate-from-yen-to-backslash)) | |
167 | 203 | + (setq default-input-method nil))) |
168 | 204 | + |
169 | 205 | + ;; |
@@ -220,11 +256,13 @@ | ||
220 | 256 | + |
221 | 257 | + (define-key global-map [2213] nil) |
222 | 258 | + (define-key global-map [3420] nil) |
259 | ++ (define-key global-map [67109029] nil) | |
223 | 260 | + (define-key global-map [67111077] nil) |
224 | 261 | + (define-key global-map [134219941] nil) |
225 | 262 | + (define-key global-map [201328805] nil) |
226 | 263 | + (define-key function-key-map [2213] [?\\]) ;; for Intel |
227 | 264 | + (define-key function-key-map [3420] [?\\]) ;; for PowerPC |
265 | ++ (define-key function-key-map [67109029] [?\C-\\]) | |
228 | 266 | + (define-key function-key-map [67111077] [?\C-\\]) |
229 | 267 | + (define-key function-key-map [134219941] [?\M-\\]) |
230 | 268 | + (define-key function-key-map [201328805] [?\C-\M-\\]) |
@@ -235,9 +273,9 @@ | ||
235 | 273 | (provide 'ns-win) |
236 | 274 | |
237 | 275 | ;; arch-tag: eb138a45-4e2e-4d68-b1c9-a39665731644 |
238 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/src/Makefile.in src/Makefile.in | |
239 | -*** ../emacs23-20090519-0/src/Makefile.in 2009-05-19 21:44:12.000000000 +0900 | |
240 | ---- src/Makefile.in 2009-05-19 21:44:46.000000000 +0900 | |
276 | +diff -p -N -r -x '*.orig' ../emacs23-20090617-0/src/Makefile.in src/Makefile.in | |
277 | +*** ../emacs23-20090617-0/src/Makefile.in 2009-06-17 17:09:53.000000000 +0900 | |
278 | +--- src/Makefile.in 2009-06-17 17:10:59.000000000 +0900 | |
241 | 279 | *************** ns_appresdir=@ns_appresdir@/ |
242 | 280 | *** 522,528 **** |
243 | 281 | ns_appsrc=@ns_appsrc@ |
@@ -283,9 +321,9 @@ | ||
283 | 321 | process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \ |
284 | 322 | commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \ |
285 | 323 | blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ |
286 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/src/macim.c src/macim.c | |
287 | -*** ../emacs23-20090519-0/src/macim.c 1970-01-01 09:00:00.000000000 +0900 | |
288 | ---- src/macim.c 2009-05-25 15:24:21.000000000 +0900 | |
324 | +diff -p -N -r -x '*.orig' ../emacs23-20090617-0/src/macim.c src/macim.c | |
325 | +*** ../emacs23-20090617-0/src/macim.c 1970-01-01 09:00:00.000000000 +0900 | |
326 | +--- src/macim.c 2009-06-17 17:10:59.000000000 +0900 | |
289 | 327 | *************** |
290 | 328 | *** 0 **** |
291 | 329 | --- 1,166 ---- |
@@ -455,12 +493,12 @@ | ||
455 | 493 | + } |
456 | 494 | + |
457 | 495 | + #endif |
458 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/src/nsfns.m src/nsfns.m | |
459 | -*** ../emacs23-20090519-0/src/nsfns.m 2009-05-19 21:44:12.000000000 +0900 | |
460 | ---- src/nsfns.m 2009-05-19 21:44:46.000000000 +0900 | |
496 | +diff -p -N -r -x '*.orig' ../emacs23-20090617-0/src/nsfns.m src/nsfns.m | |
497 | +*** ../emacs23-20090617-0/src/nsfns.m 2009-06-17 17:09:53.000000000 +0900 | |
498 | +--- src/nsfns.m 2009-06-17 17:10:59.000000000 +0900 | |
461 | 499 | *************** be used as the image of the icon represe |
462 | -*** 2710,2715 **** | |
463 | ---- 2710,2719 ---- | |
500 | +*** 2717,2722 **** | |
501 | +--- 2717,2726 ---- | |
464 | 502 | defsubr (&Sx_show_tip); |
465 | 503 | defsubr (&Sx_hide_tip); |
466 | 504 |
@@ -471,9 +509,9 @@ | ||
471 | 509 | /* used only in fontset.c */ |
472 | 510 | check_window_system_func = check_ns; |
473 | 511 | |
474 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/src/nsterm.h src/nsterm.h | |
475 | -*** ../emacs23-20090519-0/src/nsterm.h 2009-05-19 21:44:12.000000000 +0900 | |
476 | ---- src/nsterm.h 2009-05-19 21:44:46.000000000 +0900 | |
512 | +diff -p -N -r -x '*.orig' ../emacs23-20090617-0/src/nsterm.h src/nsterm.h | |
513 | +*** ../emacs23-20090617-0/src/nsterm.h 2009-06-17 17:09:53.000000000 +0900 | |
514 | +--- src/nsterm.h 2009-06-17 17:10:59.000000000 +0900 | |
477 | 515 | *************** typedef unsigned long NSUInteger; |
478 | 516 | *** 357,362 **** |
479 | 517 | --- 357,363 ---- |
@@ -484,12 +522,12 @@ | ||
484 | 522 | |
485 | 523 | /* could use list to store these, but rest of emacs has a big infrastructure |
486 | 524 | for managing a table of bitmap "records" */ |
487 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/src/nsterm.m src/nsterm.m | |
488 | -*** ../emacs23-20090519-0/src/nsterm.m 2009-05-19 21:44:12.000000000 +0900 | |
489 | ---- src/nsterm.m 2009-05-25 15:23:24.000000000 +0900 | |
525 | +diff -p -N -r -x '*.orig' ../emacs23-20090617-0/src/nsterm.m src/nsterm.m | |
526 | +*** ../emacs23-20090617-0/src/nsterm.m 2009-06-17 17:09:53.000000000 +0900 | |
527 | +--- src/nsterm.m 2009-06-18 16:14:57.000000000 +0900 | |
490 | 528 | *************** ns_term_init (Lisp_Object display_name) |
491 | -*** 3820,3825 **** | |
492 | ---- 3820,3828 ---- | |
529 | +*** 3826,3831 **** | |
530 | +--- 3826,3834 ---- | |
493 | 531 | /* [[NSNotificationCenter defaultCenter] addObserver: NSApp |
494 | 532 | selector: @selector (logNotification:) |
495 | 533 | name: nil object: nil]; */ |
@@ -500,8 +538,8 @@ | ||
500 | 538 | dpyinfo = (struct ns_display_info *)xmalloc (sizeof (struct ns_display_info)); |
501 | 539 | bzero (dpyinfo, sizeof (struct ns_display_info)); |
502 | 540 | *************** ns_term_shutdown (int sig) |
503 | -*** 4026,4031 **** | |
504 | ---- 4029,4046 ---- | |
541 | +*** 4032,4037 **** | |
542 | +--- 4035,4052 ---- | |
505 | 543 | NSLog (@"notification: '%@'", [notification name]); |
506 | 544 | } |
507 | 545 |
@@ -521,8 +559,18 @@ | ||
521 | 559 | - (void)sendEvent: (NSEvent *)theEvent |
522 | 560 | /* -------------------------------------------------------------------------- |
523 | 561 | *************** extern void update_window_cursor (struct |
524 | -*** 4594,4599 **** | |
525 | ---- 4609,4625 ---- | |
562 | +*** 4584,4589 **** | |
563 | +--- 4599,4605 ---- | |
564 | + | |
565 | + /* if it was a function key or had modifiers, pass it directly to emacs */ | |
566 | + if (fnKeysym || (emacs_event->modifiers | |
567 | ++ && emacs_event->modifiers != shift_modifier | |
568 | + && [[theEvent charactersIgnoringModifiers] length] > 0)) | |
569 | + /*[[theEvent characters] length] */ | |
570 | + { | |
571 | +*************** extern void update_window_cursor (struct | |
572 | +*** 4600,4605 **** | |
573 | +--- 4616,4632 ---- | |
526 | 574 | EV_TRAILER (theEvent); |
527 | 575 | return; |
528 | 576 | } |
@@ -540,9 +588,41 @@ | ||
540 | 588 | } |
541 | 589 | |
542 | 590 | /* if we get here we should send the key for input manager processing */ |
543 | -diff -p -N -r -x '*.orig' ../emacs23-20090519-0/src/s/darwin.h src/s/darwin.h | |
544 | -*** ../emacs23-20090519-0/src/s/darwin.h 2009-05-19 21:44:12.000000000 +0900 | |
545 | ---- src/s/darwin.h 2009-05-19 21:44:46.000000000 +0900 | |
591 | +*************** extern void update_window_cursor (struct | |
592 | +*** 4687,4696 **** | |
593 | + NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length], | |
594 | + selRange.length, selRange.location); | |
595 | + | |
596 | +- if (workingText != nil) | |
597 | +- [self deleteWorkingText]; | |
598 | + if ([str length] == 0) | |
599 | +! return; | |
600 | + | |
601 | + if (!emacs_event) | |
602 | + return; | |
603 | +--- 4714,4732 ---- | |
604 | + NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length], | |
605 | + selRange.length, selRange.location); | |
606 | + | |
607 | + if ([str length] == 0) | |
608 | +! { | |
609 | +! [self deleteWorkingText]; | |
610 | +! return; | |
611 | +! } | |
612 | +! else | |
613 | +! { | |
614 | +! if (workingText != nil) { | |
615 | +! [workingText release]; | |
616 | +! workingText = nil; | |
617 | +! processingCompose = NO; | |
618 | +! } | |
619 | +! } | |
620 | + | |
621 | + if (!emacs_event) | |
622 | + return; | |
623 | +diff -p -N -r -x '*.orig' ../emacs23-20090617-0/src/s/darwin.h src/s/darwin.h | |
624 | +*** ../emacs23-20090617-0/src/s/darwin.h 2009-06-17 17:09:53.000000000 +0900 | |
625 | +--- src/s/darwin.h 2009-06-17 17:10:59.000000000 +0900 | |
546 | 626 | *************** along with GNU Emacs. If not, see <http |
547 | 627 | *** 145,151 **** |
548 | 628 | /* Definitions for how to compile & link. */ |
@@ -1,3 +1,9 @@ | ||
1 | +2009-06-18 HASHIMOTO Taiichi <taiichi2@mac.com> | |
2 | + | |
3 | + * lisp/term/ns-win.el: i-searchの遅延を解消 | |
4 | + * lisp/term/ns-win.el (mac-translate-from-yen-to-backslash): キーを追加 | |
5 | + * src/nsterm.m: i-searchの遅延を解消.全角?を入力可能 | |
6 | + | |
1 | 7 | 2009-05-25 HASHIMOTO Taiichi <taiichi2@mac.com> |
2 | 8 | |
3 | 9 | * lisp/term/ns-win.el: Emacs23に対応. |