-
-
Notifications
You must be signed in to change notification settings - Fork 2
/
emacs-28.1-inline.patch
1389 lines (1333 loc) · 48.1 KB
/
emacs-28.1-inline.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -crN emacs_orig/configure.ac emacs-28.1/configure.ac
*** emacs_orig/configure.ac 2022-04-03 20:32:28.000000000 +0900
--- emacs-28.1/configure.ac 2022-04-06 22:54:04.000000000 +0900
***************
*** 2037,2043 ****
INSTALL_ARCH_INDEP_EXTRA=
fi
! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o $ns_fontfile"
fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
--- 2037,2043 ----
INSTALL_ARCH_INDEP_EXTRA=
fi
! NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o macim.o $ns_fontfile"
fi
CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS"
***************
*** 5723,5729 ****
darwin)
if test "$HAVE_NS" = "yes"; then
! libs_nsgui="-framework AppKit"
if test "$NS_IMPL_COCOA" = "yes"; then
libs_nsgui="$libs_nsgui -framework IOKit -framework Carbon \
-framework IOSurface -framework QuartzCore"
--- 5723,5729 ----
darwin)
if test "$HAVE_NS" = "yes"; then
! libs_nsgui="-framework AppKit -framework Carbon"
if test "$NS_IMPL_COCOA" = "yes"; then
libs_nsgui="$libs_nsgui -framework IOKit -framework Carbon \
-framework IOSurface -framework QuartzCore"
diff -crN emacs_orig/lisp/term/common-win.el emacs-28.1/lisp/term/common-win.el
*** emacs_orig/lisp/term/common-win.el 2022-03-11 16:04:21.000000000 +0900
--- emacs-28.1/lisp/term/common-win.el 2022-04-06 22:54:04.000000000 +0900
***************
*** 73,78 ****
--- 73,79 ----
(cons 12 'ns-new-frame)
(cons 13 'ns-toggle-toolbar)
(cons 14 'ns-show-prefs)
+ (cons 15 'mac-change-input-method)
))))
(set-terminal-parameter frame 'x-setup-function-keys t)))
diff -crN emacs_orig/lisp/term/ns-win.el emacs-28.1/lisp/term/ns-win.el
*** emacs_orig/lisp/term/ns-win.el 2022-03-11 16:04:21.000000000 +0900
--- emacs-28.1/lisp/term/ns-win.el 2022-04-06 22:54:04.000000000 +0900
***************
*** 182,188 ****
(define-key global-map [ns-new-frame] 'make-frame)
(define-key global-map [ns-toggle-toolbar] 'ns-toggle-toolbar)
(define-key global-map [ns-show-prefs] 'customize)
!
;; Set up a number of aliases and other layers to pretend we're using
;; the Choi/Mitsuharu Carbon port.
--- 182,188 ----
(define-key global-map [ns-new-frame] 'make-frame)
(define-key global-map [ns-toggle-toolbar] 'ns-toggle-toolbar)
(define-key global-map [ns-show-prefs] 'customize)
! (define-key global-map [mac-change-input-method] 'mac-change-input-method)
;; Set up a number of aliases and other layers to pretend we're using
;; the Choi/Mitsuharu Carbon port.
***************
*** 276,285 ****
;; editing window.)
(defface ns-working-text-face
! '((t :underline t))
"Face used to highlight working text during compose sequence insert."
:group 'ns)
(defvar ns-working-overlay nil
"Overlay used to highlight working text during compose sequence insert.
When text is in th echo area, this just stores the length of the working text.")
--- 276,298 ----
;; editing window.)
(defface ns-working-text-face
! '((((background dark)) :underline "gray80")
! (t :underline "gray20"))
"Face used to highlight working text during compose sequence insert."
:group 'ns)
+ (defface ns-marked-text-face
+ '((((background dark)) :underline "gray80")
+ (t :underline "gray20"))
+ "Face used to highlight marked text during compose sequence insert."
+ :group 'ns)
+
+ (defface ns-unmarked-text-face
+ '((((background dark)) :underline "gray20")
+ (t :underline "gray80"))
+ "Face used to highlight marked text during compose sequence insert."
+ :group 'ns)
+
(defvar ns-working-overlay nil
"Overlay used to highlight working text during compose sequence insert.
When text is in th echo area, this just stores the length of the working text.")
***************
*** 291,307 ****
(defun ns-in-echo-area ()
"Whether, for purposes of inserting working composition text, the minibuffer
is currently being used."
! (or isearch-mode
! (and cursor-in-echo-area (current-message))
! ;; Overlay strings are not shown in some cases.
! (get-char-property (point) 'invisible)
! (and (not (bobp))
! (or (and (get-char-property (point) 'display)
! (eq (get-char-property (1- (point)) 'display)
! (get-char-property (point) 'display)))
! (and (get-char-property (point) 'composition)
! (eq (get-char-property (1- (point)) 'composition)
! (get-char-property (point) 'composition)))))))
;; The 'interactive' here stays for subinvocations, so the ns-in-echo-area
;; always returns nil for some reason. If this WASN'T the case, we could
--- 304,326 ----
(defun ns-in-echo-area ()
"Whether, for purposes of inserting working composition text, the minibuffer
is currently being used."
! (setq mac-in-echo-area
! (or isearch-mode
! (and cursor-in-echo-area (current-message))
! ;; Overlay strings are not shown in some cases.
! (get-char-property (point) 'invisible)
! (and (not (bobp))
! (or (and (get-char-property (point) 'display)
! (eq (get-char-property (1- (point)) 'display)
! (get-char-property (point) 'display)))
! (and (get-char-property (point) 'composition)
! (eq (get-char-property (1- (point)) 'composition)
! (get-char-property (point) 'composition)))))))
! mac-in-echo-area)
!
! (defvar ns-put-text-p nil)
! (defvar mac-ime-before-put-text-hook nil)
! (defvar mac-ime-after-put-text-hook nil)
;; The 'interactive' here stays for subinvocations, so the ns-in-echo-area
;; always returns nil for some reason. If this WASN'T the case, we could
***************
*** 309,318 ****
;; These functions test whether in echo area and delegate accordingly.
(defun ns-put-working-text ()
(interactive)
(if (ns-in-echo-area) (ns-echo-working-text) (ns-insert-working-text)))
(defun ns-unput-working-text ()
(interactive)
! (ns-delete-working-text))
(defun ns-insert-working-text ()
"Insert contents of `ns-working-text' as UTF-8 string and mark with
--- 328,345 ----
;; These functions test whether in echo area and delegate accordingly.
(defun ns-put-working-text ()
(interactive)
+ (setq ns-put-text-p t)
+ (run-hooks 'mac-ime-before-put-text-hook)
(if (ns-in-echo-area) (ns-echo-working-text) (ns-insert-working-text)))
+
(defun ns-unput-working-text ()
(interactive)
! (setq ns-put-text-p nil)
! (run-hooks 'mac-ime-after-put-text-hook)
! (ns-delete-working-text)
! (when (and mac-ime-hide-cursor mac-ime--cursor-type)
! (setq cursor-type mac-ime--cursor-type
! mac-ime--cursor-type nil)))
(defun ns-insert-working-text ()
"Insert contents of `ns-working-text' as UTF-8 string and mark with
***************
*** 338,343 ****
--- 365,428 ----
'face 'ns-working-text-face msg)
(message "%s" msg)))
+ (defvar mac-ime--cursor-type nil)
+ (defun ns-put-marked-text (event)
+ (interactive "e")
+ (setq ns-put-text-p t)
+ (run-hooks 'mac-ime-before-put-text-hook)
+ (let ((pos (nth 1 event))
+ (len (nth 2 event)))
+ (when (and (> len 0)
+ cursor-type
+ mac-ime-hide-cursor)
+ (setq mac-ime--cursor-type cursor-type
+ cursor-type nil))
+ (if (ns-in-echo-area)
+ (ns-echo-marked-text pos len)
+ (ns-insert-marked-text pos len))))
+
+ (defun ns-insert-marked-text (mark-from mark-length)
+ "Insert the content of `ns-working-text' as a propertized `before-string'
+ of an overlay."
+ (ns-delete-working-text)
+ (let ((mark-to (+ mark-from mark-length)))
+ (when (<= mark-to (length ns-working-text))
+ (setq ns-working-overlay (make-overlay (point) (point)))
+ (if (= mark-length 0)
+ (overlay-put ns-working-overlay
+ 'before-string
+ (propertize ns-working-text 'face 'ns-working-text-face))
+ (overlay-put ns-working-overlay
+ 'before-string
+ (concat
+ (propertize (substring ns-working-text 0 mark-from)
+ 'face 'ns-unmarked-text-face)
+ (propertize (substring ns-working-text mark-from mark-to)
+ 'face 'ns-marked-text-face)
+ (propertize (substring ns-working-text mark-to nil)
+ 'face 'ns-unmarked-text-face)))))))
+
+ (defun ns-echo-marked-text (pos len)
+ "Echo contents of `ns-working-text' in message display area.
+ See `ns-insert-working-text'."
+ (ns-delete-working-text)
+ (let* ((msg (current-message))
+ (msglen (length msg))
+ message-log-max)
+ (when (integerp ns-working-overlay)
+ (setq msg (substring msg 0 (- (length msg) ns-working-overlay)))
+ (setq msglen (length msg)))
+ (setq ns-working-overlay (length ns-working-text))
+ (setq msg (concat msg ns-working-text))
+ (if (= len 0)
+ (put-text-property msglen (+ msglen ns-working-overlay)
+ 'face 'ns-working-text-face msg)
+ (put-text-property msglen (+ msglen ns-working-overlay)
+ 'face 'ns-marked-text-face msg)
+ (put-text-property (+ msglen pos) (+ msglen pos len)
+ 'face 'ns-unmarked-text-face msg))
+ (message "%s" msg)))
+
(defun ns-delete-working-text()
"Delete working text and clear `ns-working-overlay'."
(interactive)
***************
*** 355,361 ****
(message "%s" msg))))
(setq ns-working-overlay nil))
-
;; macOS file system Unicode UTF-8 NFD (decomposed form) support.
(when (eq system-type 'darwin)
;; Used prior to Emacs 25.
--- 440,445 ----
***************
*** 473,478 ****
--- 557,578 ----
:version "23.1"
:group 'ns)
+ (defcustom mac-ime-startup-state nil
+ "If non-nil, start Emacs with the specified IME state.
+ `activate' or `deactivate' shall be used.
+ If nil, inherit the IME state from macOS."
+ :type '(choice (const :tag "IME activated" activate)
+ (const :tag "IME deactivated" deactivate)
+ (const :tag "IME inherited from macOS" nil))
+ :version "27.0"
+ :group 'ns)
+
+ (defcustom mac-ime-hide-cursor t
+ "If non-nil, the cursor is not rendered when composing text."
+ :type 'boolean
+ :version "27.0"
+ :group 'ns)
+
(declare-function ns-hide-emacs "nsfns.m" (on))
(defun ns-find-file ()
***************
*** 915,920 ****
--- 1015,1551 ----
&context (window-system ns))
(ns-get-selection selection-symbol target-type))
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;
+ ;; Implementation of Input Method Extension for MacOS X
+ ;; written by Taiichi Hashimoto <[email protected]>
+ ;; enhanced by Takaaki Ishikawa <[email protected]>
+ (defvar mac-input-method-parameters
+ '(
+ ("com.apple.inputmethod.Kotoeri.Roman"
+ (title . "A")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Kotoeri.Japanese"
+ (title . "あ")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Kotoeri.Japanese.Katakana"
+ (title . "ア")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Kotoeri.Japanese.FullWidthRoman"
+ (title . "Ａ")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Kotoeri.Japanese.HalfWidthKana"
+ (title . "ｱ")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.kotoeri.Ainu"
+ (title . "アイヌ")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Korean.2SetKorean"
+ (title . "가2")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Korean.3SetKorean"
+ (title . "가3")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Korean.390Sebulshik"
+ (title . "가5")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Korean.GongjinCheongRomaja"
+ (title . "가G")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Korean.HNCRomaja"
+ (title . "가H")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Tamil.AnjalIM"
+ (title . "Anjal")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.Tamil.Tamil99"
+ (title . "Tamil")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.VietnameseIM.VietnameseSimpleTelex"
+ (title . "ST")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.VietnameseIM.VietnameseTelex"
+ (title . "TX")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.VietnameseIM.VietnameseVNI"
+ (title . "VN")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.VietnameseIM.VietnameseVIQR"
+ (title . "VQ")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.SCIM.ITABC"
+ (title . "拼")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.SCIM.WBX"
+ (title . "型")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.SCIM.WBH"
+ (title . "画")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.TCIM.Zhuyin"
+ (title . "注")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.TCIM.Pinyin"
+ (title . "拼")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.TCIM.Cangjie"
+ (title . "倉")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.TCIM.Jianyi"
+ (title . "速")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.TCIM.Dayi"
+ (title . "易")
+ (cursor-color)
+ (cursor-type))
+ ("com.apple.inputmethod.TCIM.Hanin"
+ (title . "漢")
+ (cursor-color)
+ (cursor-type))
+ ("com.google.inputmethod.Japanese.Roman"
+ (title . "G")
+ (cursor-color)
+ (cursor-type))
+ ("com.google.inputmethod.Japanese.base"
+ (title . "ぐ")
+ (cursor-color)
+ (cursor-type))
+ ("com.google.inputmethod.Japanese.Katakana"
+ (title . "グ")
+ (cursor-color)
+ (cursor-type))
+ ("com.google.inputmethod.Japanese.FullWidthRoman"
+ (title . "Ｇ")
+ (cursor-color)
+ (cursor-type))
+ ("com.google.inputmethod.Japanese.HalfWidthKana"
+ (title . "ｸﾞ")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Roman"
+ (title . "K")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Japanese"
+ (title . "か")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Japanese.Katakana"
+ (title . "カ")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Japanese.FullWidthRoman"
+ (title . "Ｋ")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Japanese.HalfWidthKana"
+ (title . "ｶ")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Japanese.HalfWidthRoman"
+ (title . "_K")
+ (cursor-color)
+ (cursor-type))
+ ("jp.monokakido.inputmethod.Kawasemi.Japanese.Code"
+ (title . "C")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok21.Roman"
+ (title . "A")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok21.Japanese"
+ (title . "あ")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok21.Japanese.Katakana"
+ (title . "ア")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok21.Japanese.FullWidthRoman"
+ (title . "英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok21.Japanese.HalfWidthEiji"
+ (title . "半英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok22.Roman"
+ (title . "A")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok22.Japanese"
+ (title . "あ")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok22.Japanese.Katakana"
+ (title . "ア")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok22.Japanese.FullWidthRoman"
+ (title . "英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok22.Japanese.HalfWidthEiji"
+ (title . "半英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok23.Roman"
+ (title . "A")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok23.Japanese"
+ (title . "あ")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok23.Japanese.Katakana"
+ (title . "ア")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok23.Japanese.FullWidthRoman"
+ (title . "英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok23.Japanese.HalfWidthEiji"
+ (title . "半英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok24.Roman"
+ (title . "A")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok24.Japanese"
+ (title . "あ")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok24.Japanese.Katakana"
+ (title . "ア")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok24.Japanese.FullWidthRoman"
+ (title . "英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok24.Japanese.HalfWidthEiji"
+ (title . "半英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok25.Roman"
+ (title . "A")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok25.Japanese"
+ (title . "あ")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok25.Japanese.Katakana"
+ (title . "ア")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok25.Japanese.FullWidthRoman"
+ (title . "英")
+ (cursor-color)
+ (cursor-type))
+ ("com.justsystems.inputmethod.atok25.Japanese.HalfWidthEiji"
+ (title . "半英")
+ (cursor-color)
+ (cursor-type))
+ )
+ "Alist of Mac script code vs parameters for input method on macOS.")
+
+ (defun mac-get-input-method-parameter (is key)
+ "Function to get a parameter of a input method."
+ (assq key (cdr (assoc is mac-input-method-parameters))))
+
+ (defun mac-get-input-method-title (&optional input-source)
+ "Return input method title of input source.
+ If input-source is nil, return one of current frame."
+ (if input-source
+ (cdr (mac-get-input-method-parameter input-source 'title))
+ current-input-method-title))
+
+ (defun mac-get-cursor-type (&optional input-source)
+ "Return cursor type of input source.
+ If input-source is nil, return one of current frame."
+ (if input-source
+ (or (cdr (mac-get-input-method-parameter input-source 'cursor-type))
+ (cdr (assq 'cursor-type default-frame-alist))
+ cursor-type)
+ (cdr (assq 'cursor-type (frame-parameters (selected-frame))))))
+
+ (defun mac-get-cursor-color (&optional input-source)
+ "Return cursor color of input source.
+ If input-source is nil, return one of current frame."
+ (if input-source
+ (or (cdr (mac-get-input-method-parameter input-source 'cursor-color))
+ (cdr (assq 'cursor-color default-frame-alist)))
+ (cdr (assq 'cursor-color (frame-parameters (selected-frame))))))
+
+ (defun mac-set-input-method-parameter (is key value)
+ "Function to set a parameter of a input method."
+ (let* ((is-param (assoc is mac-input-method-parameters))
+ (param (assq key is-param)))
+ (if is-param
+ (if param
+ (setcdr param value)
+ (setcdr is-param (cons (cons key value) (cdr is-param))))
+ (setq mac-input-method-parameters
+ (cons (list is (cons key value))
+ mac-input-method-parameters)))))
+
+ (defun mac-input-method-update (is)
+ "Function to update parameters of a input method."
+ (let ((title (mac-get-input-method-title is))
+ (type (mac-get-cursor-type is))
+ (color (mac-get-cursor-color is)))
+ (if (and title (not (equal title (mac-get-input-method-title))))
+ (setq current-input-method-title title))
+ (if (and type (not (equal type (mac-get-cursor-type))))
+ (setq cursor-type type))
+ (if (and color (not (equal color (mac-get-cursor-color))))
+ (set-cursor-color color))
+ (force-mode-line-update)
+ (if isearch-mode (isearch-update))))
+
+ (defun mac-ime-update-title ()
+ "Update title on mode line."
+ (unless isearch-mode
+ (mac-handle-input-method-change)))
+
+ (defun mac-ime-active-p ()
+ "Non-nil if current input source is not Roman or `mac-default-input-ascii'."
+ (let ((input-source (mac-get-current-input-source)))
+ (not (or (string-match "\\.\\(Roman\\|US\\|ABC\\)$" input-source)
+ (equal mac-default-input-ascii input-source)))))
+
+ (defun mac-ime-activate ()
+ "Activate input method."
+ (interactive)
+ (mac-toggle-input-method t)
+ (run-hooks 'input-method-activate-hook))
+
+ (defun mac-ime-deactivate ()
+ "Deactivate input method."
+ (interactive)
+ (mac-toggle-input-method nil)
+ (run-hooks 'input-method-deactivate-hook))
+
+ (defun mac-ime-toggle ()
+ "Toggle IME."
+ (interactive)
+ (if (mac-ime-active-p) (mac-ime-deactivate) (mac-ime-activate)))
+
+ (defvar mac-ime--before-action (mac-ime-active-p))
+ (defun mac-ime-activate-sticky ()
+ "Activate IME for minibuffer."
+ (when mac-ime--before-action
+ (mac-ime-activate)))
+
+ (defun mac-ime-deactivate-sticky ()
+ "Deactivate IME for minibuffer."
+ (when (setq mac-ime--before-action (mac-ime-active-p))
+ (mac-ime-deactivate)))
+
+ (defun mac-input-source-registerd-p (&optional input-source)
+ "Return nil, if the INPUT-SOURCE is not listed in system.
+ If INPUT-SOURCE is nil, `mac-default-input-source' is checked."
+ (let ((is (or input-source mac-default-input-source)))
+ (when (member is (mac-get-input-source-list))
+ t)))
+
+ (defun mac-toggle-input-method (&optional arg)
+ "Function to toggle input method on macOS."
+ (if arg
+ (progn
+ (make-local-variable 'input-method-function)
+ (setq deactivate-current-input-method-function 'mac-toggle-input-method)
+ (setq input-method-function nil)
+ (setq describe-current-input-method-function nil)
+ (mac-toggle-input-source t))
+ (kill-local-variable 'input-method-function)
+ (setq describe-current-input-method-function nil)
+ (mac-toggle-input-source nil)))
+
+ (defun mac-change-language-to-us ()
+ "Function to change language to us."
+ (interactive)
+ (mac-toggle-input-method nil))
+
+ (defun mac-ime-input-source-list ()
+ "Show available input sources."
+ (interactive)
+ (message "----------------")
+ (dolist (is (mac-get-input-source-list))
+ (message "%s" is))
+ (message "----------------")
+ (message "see *Messages* buffer"))
+
+ (defun mac-handle-input-method-change ()
+ "Function run when a input method change."
+ (interactive)
+ (when (member default-input-method '("MacOSX" "macOS"))
+ (let ((input-source (mac-get-current-input-source))
+ (ascii-capable (mac-input-source-is-ascii-capable)))
+ (cond ((and (not current-input-method) (not ascii-capable))
+ (set-input-method "macOS"))
+ ((and (equal current-input-method "macOS") ascii-capable)
+ (toggle-input-method nil)))
+ (mac-input-method-update input-source))))
+
+ ;;;###autoload
+ (defun mac-build-info ()
+ "Display build information in a buffer."
+ (interactive)
+ (switch-to-buffer (get-buffer-create "*Build info*"))
+ (setq tab-width 4)
+ (let ((buffer-read-only nil))
+ (erase-buffer)
+ (insert (format "GNU Emacs %s\nCommit:\t\t%s\nBranch:\t\t%s\n"
+ emacs-version
+ emacs-repository-version
+ emacs-repository-branch))
+ (insert (format "System:\t\t%s\nDate:\t\t%s\n"
+ system-configuration
+ (format-time-string "%Y-%m-%d %T (%Z)" emacs-build-time)))
+ (insert (format "Patch:\t\t%s ns-inline.patch\n"
+ (if (boundp 'mac-ime--cursor-type) "with" "without")))
+ (insert (format "Features:\t%s\n" system-configuration-features)))
+ (view-mode))
+
+ ;;
+ ;; Emacs input method for input method on macOS.
+ ;;
+ (register-input-method "macOS" "macOS" 'mac-toggle-input-method
+ "Mac" "Input Method on macOS System")
+
+ ;;
+ ;; Minor mode of using input methods on macOS
+ ;;
+ (define-minor-mode mac-input-method-mode
+ "Use input methods on macOS."
+ :init-value nil
+ :group 'ns
+ :global t
+ (if mac-input-method-mode
+ (progn
+ (setq default-input-method "macOS")
+ ;; (add-hook 'minibuffer-setup-hook 'mac-change-language-to-us)
+ (mac-translate-from-yen-to-backslash)
+ (cond ((eq mac-ime-startup-state 'activate) (mac-ime-activate))
+ ((eq mac-ime-startup-state 'deactivate) (mac-ime-deactivate)))
+ (mac-handle-input-method-change)
+ (add-hook 'minibuffer-setup-hook #'mac-ime-deactivate-sticky)
+ (add-hook 'minibuffer-exit-hook #'mac-ime-activate-sticky)
+ (add-hook 'buffer-list-update-hook #'mac-ime-update-title)
+ (add-function :after after-focus-change-function #'mac-ime-update-title)
+ (when (and (not mac-default-input-source)
+ (string-match "\\.ABC$" (mac-get-locale-input-source)))
+ (warn "Variable `mac-default-input-source' should be configured, otherwise IME cannot switch input source")))
+ (setq default-input-method nil)
+ (remove-hook 'minibuffer-setup-hook #'mac-ime-deactivate-sticky)
+ (remove-hook 'minibuffer-exit-hook #'mac-ime-activate-sticky)
+ (remove-hook 'buffer-list-update-hook #'mac-ime-update-title)
+ (remove-function after-focus-change-function #'mac-ime-update-title)))
+
+ ;;
+ ;; Valiable and functions to pass key(shortcut) to system.
+ ;;
+ (defvar mac-keys-passed-to-system nil
+ "A list of keys passed to system on macOS.")
+
+ (defun mac-add-key-passed-to-system (key)
+ (let ((shift '(shift shft))
+ (control '(control ctrl ctl))
+ (option '(option opt alternate alt))
+ (command '(command cmd)))
+
+ (add-to-list 'mac-keys-passed-to-system
+ (cond ((symbolp key)
+ (cond ((memq key shift)
+ (cons ns-shift-key-mask nil))
+ ((memq key control)
+ (cons ns-control-key-mask nil))
+ ((memq key option)
+ (cons ns-alternate-key-mask nil))
+ ((memq key command)
+ (cons ns-command-key-mask nil))
+ (t (cons nil nil))))
+ ((numberp key) (cons 0 key))
+ ((listp key)
+ (let ((l key) (k nil) (m 0))
+ (while l
+ (cond ((memq (car l) shift)
+ (setq m (logior m ns-shift-key-mask)))
+ ((memq (car l) control)
+ (setq m (logior m ns-control-key-mask)))
+ ((memq (car l) option)
+ (setq m (logior m ns-alternate-key-mask)))
+ ((memq (car l) command)
+ (setq m (logior m ns-command-key-mask)))
+ ((numberp (car l))
+ (if (not k) (setq k (car l)))))
+ (setq l (cdr l)))
+ (cons m k)))
+ (t (cons nil nil))))))
+
+ ;;
+ ;; Entry Emacs event for inline input method on macOS.
+ ;;
+ (define-key special-event-map
+ [mac-change-input-method] 'mac-handle-input-method-change)
+
+ ;;
+ ;; Convert yen to backslash for JIS keyboard.
+ ;;
+ (defun mac-translate-from-yen-to-backslash ()
+ ;; Convert yen to backslash for JIS keyboard.
+ (interactive)
+
+ (define-key global-map [165] nil)
+ (define-key global-map [2213] nil)
+ (define-key global-map [3420] nil)
+ (define-key global-map [67109029] nil)
+ (define-key global-map [67111077] nil)
+ (define-key global-map [8388773] nil)
+ (define-key global-map [134219941] nil)
+ (define-key global-map [75497596] nil)
+ (define-key global-map [201328805] nil)
+ (define-key function-key-map [165] [?\\])
+ (define-key function-key-map [2213] [?\\]) ;; for Intel
+ (define-key function-key-map [3420] [?\\]) ;; for PowerPC
+ (define-key function-key-map [67109029] [?\C-\\])
+ (define-key function-key-map [67111077] [?\C-\\])
+ (define-key function-key-map [8388773] [?\M-\\])
+ (define-key function-key-map [134219941] [?\M-\\])
+ (define-key function-key-map [75497596] [?\C-\M-\\])
+ (define-key function-key-map [201328805] [?\C-\M-\\])
+ )
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
(provide 'ns-win)
(provide 'term/ns-win)
diff -crN emacs_orig/src/Makefile.in emacs-28.1/src/Makefile.in
*** emacs_orig/src/Makefile.in 2022-03-11 16:04:22.000000000 +0900
--- emacs-28.1/src/Makefile.in 2022-04-06 22:54:04.000000000 +0900
***************
*** 419,425 ****
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o dbusbind.o cygw32.o \
! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macfont.o \
nsxwidget.o \
w32.o w32console.o w32cygwinx.o w32fns.o w32heap.o w32inevt.o w32notify.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
--- 419,425 ----
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o dbusbind.o cygw32.o \
! nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macfont.o macim.o \
nsxwidget.o \
w32.o w32console.o w32cygwinx.o w32fns.o w32heap.o w32inevt.o w32notify.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
diff -crN emacs_orig/src/keyboard.c emacs-28.1/src/keyboard.c
*** emacs_orig/src/keyboard.c 2022-03-11 16:04:22.000000000 +0900
--- emacs-28.1/src/keyboard.c 2022-04-06 22:54:04.000000000 +0900
***************
*** 5541,5549 ****
#ifdef HAVE_NS
case NS_TEXT_EVENT:
! return list1 (intern (event->code == KEY_NS_PUT_WORKING_TEXT
! ? "ns-put-working-text"
! : "ns-unput-working-text"));
/* NS_NONKEY_EVENTs are just like NON_ASCII_KEYSTROKE_EVENTs,
except that they are non-key events (last-nonmenu-event is nil). */
--- 5541,5552 ----
#ifdef HAVE_NS
case NS_TEXT_EVENT:
! if (event->code == KEY_NS_PUT_WORKING_TEXT)
! return list1 (intern ("ns-put-working-text"));
! else if (event->code == KEY_NS_PUT_MARKED_TEXT)
! return Fcons (intern ("ns-put-marked-text"), event->arg);
! else
! return list1 (intern ("ns-unput-working-text"));
/* NS_NONKEY_EVENTs are just like NON_ASCII_KEYSTROKE_EVENTs,
except that they are non-key events (last-nonmenu-event is nil). */
***************
*** 12562,12567 ****
--- 12565,12572 ----
"ns-put-working-text");
initial_define_lispy_key (Vspecial_event_map, "ns-unput-working-text",
"ns-unput-working-text");
+ initial_define_lispy_key (Vspecial_event_map, "ns-put-marked-text",
+ "ns-put-marked-text");
/* Here we used to use `ignore-event' which would simple set prefix-arg to
current-prefix-arg, as is done in `handle-switch-frame'.
But `handle-switch-frame is not run from the special-map.
diff -crN emacs_orig/src/macim.h emacs-28.1/src/macim.h
*** emacs_orig/src/macim.h 1970-01-01 09:00:00.000000000 +0900
--- emacs-28.1/src/macim.h 2022-04-06 22:54:04.000000000 +0900
***************
*** 0 ****
--- 1,11 ----
+ /* Implementation of Input Method Extension for macOS.
+ Copyright (C) 2020
+ Takaaki Ishikawa <[email protected]>
+ */
+ #ifdef NS_IMPL_COCOA
+ void mac_init_input_method ();
+ int mac_pass_key_to_system (int code, int modifiers);
+ int mac_pass_key_directly_to_emacs ();
+ int mac_store_change_input_method_event ();
+ NSString* mac_get_locale ();
+ #endif
diff -crN emacs_orig/src/macim.m emacs-28.1/src/macim.m
*** emacs_orig/src/macim.m 1970-01-01 09:00:00.000000000 +0900
--- emacs-28.1/src/macim.m 2022-04-06 22:54:04.000000000 +0900
***************
*** 0 ****
--- 1,229 ----
+ /* Implementation of Input Method Extension for macOS.
+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Taiichi Hashimoto <[email protected]>.
+
+ 2019
+ enhanced by Takaaki Ishikawa <[email protected]>
+ */
+
+ #include "config.h"
+
+ #ifdef NS_IMPL_COCOA
+
+ #include <math.h>
+ #include <sys/types.h>
+ #include <time.h>
+ #include <signal.h>
+ #include <unistd.h>
+
+ #include <Carbon/Carbon.h>
+
+ #include "lisp.h"
+ #include "blockinput.h"
+
+ #include "termhooks.h"
+ #include "keyboard.h"
+ #include "buffer.h"
+
+ #include "macim.h"
+
+ //extern Lisp_Object Qcurrent_input_method;
+ //extern int cursor_in_echo_area;
+ static Lisp_Object Qmac_keys_passed_to_system;
+
+ DEFUN ("mac-input-source-is-ascii-capable", Fmac_input_source_is_ascii_capable, Smac_input_source_is_ascii_capable,
+ 0, 0, 0,
+ doc: /* Is current input source ascii capable? */)
+ (void)
+ {
+ TISInputSourceRef is = TISCopyCurrentKeyboardInputSource();
+ CFBooleanRef ret = TISGetInputSourceProperty(is, kTISPropertyInputSourceIsASCIICapable);
+
+ return CFBooleanGetValue(ret)? Qt : Qnil;
+ }
+
+ DEFUN ("mac-get-locale-input-source", Fmac_get_locale_input_source, Smac_get_locale_input_source,
+ 0, 0, 0,
+ doc: /* get input source based on locale */)
+ (void)
+ {
+ NSString *locale = mac_get_locale();
+ // locale = @"ja-JP";
+ // NSLog(@"%@", locale);
+
+ TISInputSourceRef is = TISCopyInputSourceForLanguage((CFStringRef)locale);
+ NSString *id = (NSString *)TISGetInputSourceProperty(is, kTISPropertyInputSourceID);
+
+ return make_string([id UTF8String],
+ [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+ }
+
+ DEFUN ("mac-get-input-source-list", Fmac_get_input_source_list, Smac_get_input_source_list,
+ 0, 0, 0,
+ doc: /* get input source list on macOS */)
+ (void)
+ {
+ NSArray *is_list = (NSArray *)TISCreateInputSourceList(NULL, false);
+ int list_size = [is_list count];
+ Lisp_Object list[list_size];
+ int i;
+
+ for (i = 0; i < list_size; i++) {
+ TISInputSourceRef is = (TISInputSourceRef)[is_list objectAtIndex:i];
+ NSString *id = (NSString *)TISGetInputSourceProperty(is, kTISPropertyInputSourceID);
+ list[i] = make_string([id UTF8String],
+ [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+ }
+
+ return Flist(list_size, list);
+ }
+
+ DEFUN ("mac-get-current-input-source", Fmac_get_current_input_source, Smac_get_current_input_source,
+ 0, 0, 0,
+ doc: /* get current input source on macOS */)
+ (void)
+ {
+ TISInputSourceRef is = TISCopyCurrentKeyboardInputSource();
+ NSString *id = (NSString *)TISGetInputSourceProperty(is, kTISPropertyInputSourceID);
+
+ return make_string([id UTF8String],
+ [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+ }
+
+ DEFUN ("mac-toggle-input-source", Fmac_toggle_input_source, Smac_toggle_input_source,
+ 1, 1, 0,
+ doc: /* toggle input source on macOS */)
+ (arg)
+ Lisp_Object arg;