[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 843333ffa8 1/2: Fix Koutliner char movement c
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/hyperbole 843333ffa8 1/2: Fix Koutliner char movement cmds and override orgtbl bindings |
|
Date: |
Sun, 28 May 2023 03:58:08 -0400 (EDT) |
branch: externals/hyperbole
commit 843333ffa82a65074b9c234b5e35c71af5e22ef4
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>
Fix Koutliner char movement cmds and override orgtbl bindings
---
ChangeLog | 27 +-
TAGS | 1566 ++++++++++++++++++++++++++-------------------------
hversion.el | 4 +-
kotl/kotl-mode.el | 537 +++++++++---------
kotl/kotl-orgtbl.el | 73 ++-
5 files changed, 1157 insertions(+), 1050 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e2a356455..56193ac6d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,26 @@
-2023-05-23 Bob Weiner <rsw@gnu.org>
-
-* hversion.el (hyperb:path-being-loaded): Add support for .eln natively
compiled
- files.
+2023-05-27 Bob Weiner <rsw@gnu.org>
+
+* kotl/kotl-mode.el (kotl-mode:setup-keymap): Create this function instead
+ of setting up keymap at library load time so that key rebindings occur
+ when in kotl-mode with orgtbl-mode active, for example, so keys from it
+ that need rebinding are active when kotl-mode-map is setup. Call from
+ 'kotl-mode' but runs only when kotl-mode-map is nil.
+ (kotl-mode) Replace local binding of 'minor-mode-alist'
+ with 'minor-mode-overriding-map-alist'.
+ kotl/kotl-orgtbl.el (orgtbl-meta-return): Rename to
+ 'kotl-mode:orgtbl-meta-return' and use only in 'kotl-mode'.
+ (kotl-mode:org-self-insert-command,
+ kotl-mode:self-insert-command,
+ kotl-mode:setup-overriding-orgtbl-keymap): Add to
+ fix overriding keys in 'orgtbl-mode-map' within 'kotl-mode'.
+ (kotl-mode:backward-char,
+ kotl-mode:forward-char): Fix to handle when point
+ is outside of a valid outline position.
+ (kotl-mode:eocp): Change to call (kotl-mode:eolp t)
+ so does not trigger eoc when at eol but cell is collapsed.
+ (kotl-mode:pre-self-insert-command): Remove unneeded
+ second check of whether point is in a valid koutline position and run
+ during kotl-mode:*self-insert-command calls.
2023-05-22 Bob Weiner <rsw@gnu.org>
diff --git a/TAGS b/TAGS
index 744b7066f0..f474fd8be0 100644
--- a/TAGS
+++ b/TAGS
@@ -79,18 +79,18 @@ hactypes.el,1275
(defact link-to-Info-index-item 469,18495
(defact link-to-Info-node 484,19252
(defact link-to-ibut 499,19978
-(defact link-to-kcell 549,22004
-(defact link-to-mail 569,22705
-(defact link-to-org-id 593,23872
-(defact link-to-org-id-marker 602,24185
-(defact link-to-regexp-match 612,24563
-(defact link-to-rfc 639,25634
-(defact link-to-string-match 646,25902
-(defact link-to-texinfo-node 655,26355
-(defact link-to-web-search 680,27408
-(defact man-show 688,27789
-(defact rfc-toc 696,28099
-(defact text-toc 723,29266
+(defact link-to-kcell 547,21993
+(defact link-to-mail 567,22694
+(defact link-to-org-id 591,23861
+(defact link-to-org-id-marker 600,24174
+(defact link-to-regexp-match 610,24552
+(defact link-to-rfc 637,25623
+(defact link-to-string-match 644,25891
+(defact link-to-texinfo-node 653,26344
+(defact link-to-web-search 678,27397
+(defact man-show 686,27778
+(defact rfc-toc 694,28088
+(defact text-toc 721,29255
hargs.el,961
(defvar hargs:defaults 41,1440
@@ -181,126 +181,126 @@ hbut.el,5492
(defun ebut:next-occurrence 311,11920
(defun ebut:operate 326,12599
(defun ebut:program 435,16797
-(defun ebut:search 465,18200
-(defun ebut:to 544,20864
-(defun ebut:delimit 577,22197
-(defun ebut:match-regexp 604,23265
-(defconst ebut:label-start 615,23705
-(defconst ebut:label-end 617,23806
-(defconst hbut:instance-sep 619,23905
-(defun gbut:act 626,24245
-(defun gbut:delete 641,24860
-(defun gbut:ebut-program 646,25083
-(defun gbut:file 666,25974
-(defun gbut:get 670,26132
-(defun gbut:help 682,26546
-(defun gbut:label-list 693,26968
-(defun gbut:label-p 697,27087
-(defun gbut:to 712,27902
-(defun gbut:key-list 730,28559
-(defun gbut:ebut-key-list 734,28685
-(defun gbut:ibut-key-list 748,29146
-(defun hattr:attributes 761,29655
-(defun hattr:clear 771,29960
-(defun hattr:copy 782,30336
-(defun hattr:emacs-button-attributes 793,30726
-(defun hattr:emacs-button-is-p 806,31216
-(defun hattr:get 813,31502
-(defun hattr:list 817,31636
-(defun hattr:memq 825,31913
-(defun hattr:report 837,32344
-(defun hattr:save 865,33370
-(defun hattr:set 883,34222
-(defalias 'hattr:summarize hattr:summarize887,34401
-(defvar hattr:filename889,34445
-(defconst hbut:max-len 899,34878
-(defsubst hbut:max-len 906,35119
-(defun hbut:act 910,35269
-(defun hbut:action 973,37972
-(defun hbut:at-p 983,38280
-(defun hbut:comment 996,38680
-(defvar hbut:fill-prefix-regexps1029,39828
-(defun hbut:fill-prefix-remove 1053,40676
-(defun hbut:delete 1063,41068
-(defun hbut:funcall 1078,41701
-(defun hbut:get 1104,42764
-(defun hbut:get-key-src 1115,43292
-(defun hbut:is-p 1173,45579
-(defun hbut:key 1178,45738
-(defun hbut:to-key-src 1185,45958
-(defun hbut:key-src-fmt 1192,46277
-(defun hbut:key-src-set-buffer 1208,46927
-(defun hbut:key-to-label 1230,47626
-(defun hbut:label 1251,48310
-(defun hbut:label-list 1267,48924
-(defun hbut:label-p 1271,49078
-(defun hbut:label-regexp 1284,49853
-(defun hbut:label-to-key 1318,51080
-(defun hbut:map 1331,51670
-(defvar hbut:syntax-table 1387,53857
-(defun hbut:modify-syntax 1393,54127
-(defun hbut:outside-comment-p 1408,54754
-(defun hbut:rename 1416,55114
-(defun hbut:report 1427,55520
-(defun hbut:source 1486,57454
-(defalias 'hbut:summarize hbut:summarize1501,58027
-(defun hbut:to 1503,58068
-(defvar hbut:current 1510,58396
-(defconst hbut:source-prefix 1513,58501
-(defun hbut:key-list 1520,58832
-(defun hbut:ebut-key-list 1524,58997
-(defun hbut:ibut-key-list 1539,59522
-(defun ibut:act 1553,60065
-(defun ibut:alist 1564,60471
-(defun ibut:at-p 1570,60700
-(defun ibut:at-type-p 1614,62539
-(cl-defun ibut:create 1630,63263
-(def-edebug-spec cl-defun1754,67542
-(def-edebug-spec lambda-key-list1759,67689
-(defun ibut:delete 1765,67861
-(defun ibut:delimit 1792,68867
-(defun ibut:edit 1819,69936
-(defun ibut:get 1830,70410
-(defun ibut:is-p 1852,71227
-(defun ibut:label-map 1858,71482
-(defun ibut:label-key-match 1873,72271
-(defun ibut:label-p 1883,72651
-(defun ibut:label-regexp 1901,73641
-(defun ibut:label-set 1907,73932
-(defun ibut:label-sort-keys 1929,74963
-(defun ibut:list 1948,75593
-(defun ibut:key 1970,76444
-(defalias 'ibut:to-key-src ibut:to-key-src1977,76682
-(defalias 'ibut:key-to-label ibut:key-to-label1978,76729
-(defalias 'ibut:label-to-key ibut:label-to-key1979,76778
-(defalias 'map-ibut map-ibut1980,76827
-(defun ibut:map 1982,76868
-(defun ibut:next-occurrence 1993,77361
-(defun ibut:operate 2008,78106
-(defun ibut:insert-text 2130,82596
-(defun ibut:previous-occurrence 2176,84683
-(defun ibut:program 2191,85414
-(defun ibut:rename 2221,86817
-(defalias 'ibut:summarize ibut:summarize2241,87752
-(defun ibut:to 2243,87793
-(defun ibut:at-to-name-p 2290,89434
-(defun ibut:to-name 2314,90232
-(defun ibut:to-text 2347,91551
-(defconst ibut:label-start 2397,93598
-(defconst ibut:label-end 2399,93699
-(defvar ibut:label-separator 2402,93799
-(defvar ibut:label-separator-regexp 2410,94116
-(defmacro defib 2417,94455
-(def-edebug-spec defib2454,96140
-(def-edebug-spec lambda-list2459,96280
-(defalias 'ibtype:create ibtype:create2464,96398
-(defun ibtype:activate-link 2466,96433
-(defmacro defil 2478,96882
-(defmacro defal 2575,101220
-(defalias 'ibtype:create-action-link-type
ibtype:create-action-link-type2631,103389
-(defalias 'ibtype:create-regexp-link-type
ibtype:create-regexp-link-type2632,103440
-(defun ibtype:def-symbol 2634,103492
-(defun ibtype:delete 2644,103849
+(defun ebut:search 466,18248
+(defun ebut:to 545,20912
+(defun ebut:delimit 579,22264
+(defun ebut:match-regexp 606,23332
+(defconst ebut:label-start 617,23772
+(defconst ebut:label-end 619,23873
+(defconst hbut:instance-sep 621,23972
+(defun gbut:act 628,24312
+(defun gbut:delete 643,24927
+(defun gbut:ebut-program 648,25150
+(defun gbut:file 668,26041
+(defun gbut:get 672,26199
+(defun gbut:help 684,26613
+(defun gbut:label-list 695,27035
+(defun gbut:label-p 699,27154
+(defun gbut:to 714,27969
+(defun gbut:key-list 732,28626
+(defun gbut:ebut-key-list 736,28752
+(defun gbut:ibut-key-list 750,29213
+(defun hattr:attributes 763,29722
+(defun hattr:clear 773,30027
+(defun hattr:copy 784,30403
+(defun hattr:emacs-button-attributes 795,30793
+(defun hattr:emacs-button-is-p 808,31283
+(defun hattr:get 815,31569
+(defun hattr:list 819,31703
+(defun hattr:memq 827,31980
+(defun hattr:report 839,32411
+(defun hattr:save 867,33437
+(defun hattr:set 885,34289
+(defalias 'hattr:summarize hattr:summarize889,34468
+(defvar hattr:filename891,34512
+(defconst hbut:max-len 901,34945
+(defsubst hbut:max-len 908,35186
+(defun hbut:act 912,35336
+(defun hbut:action 975,38039
+(defun hbut:at-p 985,38347
+(defun hbut:comment 998,38747
+(defvar hbut:fill-prefix-regexps1031,39974
+(defun hbut:fill-prefix-remove 1055,40822
+(defun hbut:delete 1065,41214
+(defun hbut:funcall 1080,41847
+(defun hbut:get 1107,42979
+(defun hbut:get-key-src 1118,43507
+(defun hbut:is-p 1176,45794
+(defun hbut:key 1181,45953
+(defun hbut:to-key-src 1188,46173
+(defun hbut:key-src-fmt 1195,46492
+(defun hbut:key-src-set-buffer 1211,47142
+(defun hbut:key-to-label 1233,47841
+(defun hbut:label 1254,48525
+(defun hbut:label-list 1270,49139
+(defun hbut:label-p 1274,49293
+(defun hbut:label-regexp 1287,50068
+(defun hbut:label-to-key 1321,51295
+(defun hbut:map 1334,51885
+(defvar hbut:syntax-table 1390,54072
+(defun hbut:modify-syntax 1396,54342
+(defun hbut:outside-comment-p 1411,54969
+(defun hbut:rename 1419,55329
+(defun hbut:report 1430,55735
+(defun hbut:source 1489,57669
+(defalias 'hbut:summarize hbut:summarize1504,58242
+(defun hbut:to 1506,58283
+(defvar hbut:current 1513,58611
+(defconst hbut:source-prefix 1516,58716
+(defun hbut:key-list 1523,59047
+(defun hbut:ebut-key-list 1527,59212
+(defun hbut:ibut-key-list 1542,59737
+(defun ibut:act 1556,60280
+(defun ibut:alist 1567,60686
+(defun ibut:at-p 1573,60915
+(defun ibut:at-type-p 1617,62754
+(cl-defun ibut:create 1633,63478
+(def-edebug-spec cl-defun1758,67787
+(def-edebug-spec lambda-key-list1763,67934
+(defun ibut:delete 1769,68106
+(defun ibut:delimit 1796,69112
+(defun ibut:edit 1823,70181
+(defun ibut:get 1834,70655
+(defun ibut:is-p 1856,71472
+(defun ibut:label-map 1864,71765
+(defun ibut:label-key-match 1879,72554
+(defun ibut:label-p 1889,72934
+(defun ibut:label-regexp 1907,73924
+(defun ibut:label-set 1913,74215
+(defun ibut:label-sort-keys 1935,75246
+(defun ibut:list 1954,75876
+(defun ibut:key 1976,76727
+(defalias 'ibut:to-key-src ibut:to-key-src1983,76965
+(defalias 'ibut:key-to-label ibut:key-to-label1984,77012
+(defalias 'ibut:label-to-key ibut:label-to-key1985,77061
+(defalias 'map-ibut map-ibut1986,77110
+(defun ibut:map 1988,77151
+(defun ibut:next-occurrence 1999,77644
+(defun ibut:operate 2014,78389
+(defun ibut:insert-text 2136,82879
+(defun ibut:previous-occurrence 2185,85074
+(defun ibut:program 2200,85805
+(defun ibut:rename 2231,87256
+(defalias 'ibut:summarize ibut:summarize2251,88191
+(defun ibut:to 2253,88232
+(defun ibut:at-to-name-p 2301,89892
+(defun ibut:to-name 2325,90690
+(defun ibut:to-text 2359,92029
+(defconst ibut:label-start 2410,94098
+(defconst ibut:label-end 2412,94199
+(defvar ibut:label-separator 2415,94299
+(defvar ibut:label-separator-regexp 2423,94616
+(defmacro defib 2430,94955
+(def-edebug-spec defib2467,96640
+(def-edebug-spec lambda-list2472,96780
+(defalias 'ibtype:create ibtype:create2477,96898
+(defun ibtype:activate-link 2479,96933
+(defmacro defil 2491,97382
+(defmacro defal 2588,101720
+(defalias 'ibtype:create-action-link-type
ibtype:create-action-link-type2644,103889
+(defalias 'ibtype:create-regexp-link-type
ibtype:create-regexp-link-type2645,103940
+(defun ibtype:def-symbol 2647,103992
+(defun ibtype:delete 2657,104349
hgnus.el,110
(defun Gnus-init 54,1683
@@ -440,20 +440,20 @@ hibtypes.el,1664
(defib ipython-stack-frame 889,40711
(defib ripgrep-msg 931,42873
(defib grep-msg 977,45014
-(defun hib-python-traceback 1044,48780
-(defib debugger-source 1055,49392
-(defib elisp-compiler-msg 1141,53433
-(defib patch-msg 1243,58504
-(defib texinfo-ref 1270,59708
-(defib gnus-push-button 1355,64236
-(defib Info-node 1367,64778
-(defib hyp-address 1400,66467
-(defib hyp-source 1419,67481
-(defconst action:start 1446,68600
-(defconst action:end 1449,68709
-(defib action 1458,69059
-(defun action:help 1556,73666
-(defib completion 1583,74758
+(defun hib-python-traceback 1045,48862
+(defib debugger-source 1056,49474
+(defib elisp-compiler-msg 1142,53515
+(defib patch-msg 1244,58586
+(defib texinfo-ref 1271,59790
+(defib gnus-push-button 1356,64318
+(defib Info-node 1368,64860
+(defib hyp-address 1401,66549
+(defib hyp-source 1420,67563
+(defconst action:start 1447,68682
+(defconst action:end 1450,68791
+(defib action 1459,69141
+(defun action:help 1557,73748
+(defib completion 1584,74840
hinit.el,145
(defvar hyperb:user-email 22,623
@@ -462,16 +462,16 @@ hinit.el,145
(defun hyperb:check-dir-user 71,2629
hload-path.el,484
-(defvar hyperb:microsoft-os-p29,872
-(defvar hyperb:wsl-os-p36,1141
-(defvar hyperb:dir 44,1525
-(defmacro hyperb:with-suppressed-warnings 86,3307
-(defalias
'hload-path--make-directory-autoloadshload-path--make-directory-autoloads121,4752
-(defun hload-path--internal-make-directory-autoloads 129,5023
-(defun hyperb:autoloads-exist-p 152,6091
-(defun hyperb:maybe-generate-autoloads 158,6386
-(defun hyperb:generate-autoloads 164,6655
-(defun hyperb:maybe-load-autoloads 179,7438
+(defvar hyperb:microsoft-os-p29,871
+(defvar hyperb:wsl-os-p36,1140
+(defvar hyperb:dir 44,1524
+(defmacro hyperb:with-suppressed-warnings 86,3306
+(defalias
'hload-path--make-directory-autoloadshload-path--make-directory-autoloads121,4751
+(defun hload-path--internal-make-directory-autoloads 129,5022
+(defun hyperb:autoloads-exist-p 152,6090
+(defun hyperb:maybe-generate-autoloads 158,6385
+(defun hyperb:generate-autoloads 164,6654
+(defun hyperb:maybe-load-autoloads 179,7437
hmail.el,876
(defvar hnews:composer 38,1419
@@ -632,36 +632,36 @@ hmouse-drv.el,3999
(defalias 'quit-window quit-window1121,44731
(defun hkey-help-show 1132,45164
(defun hkey-mouse-help 1182,47438
-(defun hkey-operate 1209,48455
-(defun hkey-summarize 1253,50267
-(defun hkey-toggle-debug 1274,51028
-(defun hmouse-depress-inactive-minibuffer-p 1287,51582
-(defun hmouse-vertical-line-spacing 1299,52085
-(defun hmouse-window-at-absolute-pixel-position 1311,52593
-(defun hmouse-window-coordinates 1423,57877
-(defun hmouse-key-release-buffer 1465,59758
-(defun hmouse-key-release-window 1472,60056
-(defun hmouse-key-release-args-emacs 1477,60290
-(defun hmouse-use-region-p 1507,61716
-(defun hmouse-save-region 1512,61871
-(defun hmouse-set-point 1529,62670
-(defun hmouse-set-point-at 1539,63133
-(defun hmouse-release 1560,64061
-(defun hmouse-function 1582,65119
-(defun smart-scroll-down 1611,66451
-(defun smart-scroll-up 1636,67357
+(defun hkey-operate 1221,48929
+(defun hkey-summarize 1265,50741
+(defun hkey-toggle-debug 1286,51502
+(defun hmouse-depress-inactive-minibuffer-p 1299,52056
+(defun hmouse-vertical-line-spacing 1311,52559
+(defun hmouse-window-at-absolute-pixel-position 1323,53067
+(defun hmouse-window-coordinates 1435,58351
+(defun hmouse-key-release-buffer 1477,60232
+(defun hmouse-key-release-window 1484,60530
+(defun hmouse-key-release-args-emacs 1489,60764
+(defun hmouse-use-region-p 1519,62190
+(defun hmouse-save-region 1524,62345
+(defun hmouse-set-point 1541,63144
+(defun hmouse-set-point-at 1551,63607
+(defun hmouse-release 1572,64535
+(defun hmouse-function 1594,65593
+(defun smart-scroll-down 1623,66925
+(defun smart-scroll-up 1648,67831
hmouse-key.el,393
-(defun hmouse-check-action-key 38,1286
-(defun hmouse-check-assist-key 46,1748
-(defun hmouse-set-bindings 54,2210
-(defun hmouse-install 70,2752
-(defun hmouse-add-unshifted-smart-keys 97,4073
-(defun hmouse-toggle-bindings 103,4251
-(defun hmouse-update-smart-keys 126,5283
-(defvar hmouse-bindings 143,5945
-(defvar hmouse-bindings-flag 146,6035
-(defvar hmouse-previous-bindings 149,6129
+(defun hmouse-check-action-key 38,1285
+(defun hmouse-check-assist-key 46,1747
+(defun hmouse-set-bindings 54,2209
+(defun hmouse-install 70,2751
+(defun hmouse-add-unshifted-smart-keys 97,4072
+(defun hmouse-toggle-bindings 103,4250
+(defun hmouse-update-smart-keys 126,5282
+(defvar hmouse-bindings 142,5881
+(defvar hmouse-bindings-flag 145,5971
+(defvar hmouse-previous-bindings 148,6065
hmouse-mod.el,403
(defvar hmouse-mod--global-map 74,2697
@@ -796,105 +796,105 @@ hpath.el,5601
(defvar hpath:info-suffix 393,18032
(defcustom hpath:internal-display-alist396,18169
(defvar hpath:display-buffer-alist442,19974
-(defvar hpath:display-where 477,21508
-(defvar hpath:display-where-alist483,21786
-(defcustom hpath:native-image-suffixes 515,23123
-(defcustom hpath:variables535,24087
-(defvar hpath:rfc 547,24658
-(defcustom hpath:suffixes 550,24795
-(defvar hpath:tmp-prefix 556,25012
-(defvar hpath:url-regexp 565,25507
-(defvar hpath:url-hostnames-regexp 577,26295
-(defvar hpath:url-regexp2580,26452
-(defvar hpath:url-regexp3597,27331
-(defconst hpath:url-keyword-grpn 614,28208
-(defconst hpath:url-grpn 617,28343
-(defconst hpath:protocol-grpn 619,28451
-(defconst hpath:username-grpn 621,28566
-(defconst hpath:sitename-grpn 623,28683
-(defconst hpath:hostname-grpn 626,28804
-(defconst hpath:portnumber-grpn 629,28971
-(defconst hpath:pathname-grpn 632,29099
-(defvar hpath:string-url-regexp 636,29226
-(defvar hpath:string-url-regexp2 641,29461
-(defvar hpath:string-url-regexp3 646,29704
-(defconst hpath:html-anchor-id-pattern 655,30124
-(defconst hpath:markdown-anchor-id-pattern 659,30302
-(defconst hpath:markdown-section-pattern 663,30467
-(defconst hpath:markdown-suffix-regexp 667,30670
-(defconst hpath:outline-section-pattern 670,30776
-(defvar hpath:prefix-regexp 674,31003
-(defvar hpath:remote-regexp681,31310
-(defconst hpath:shell-modes 685,31477
-(defconst hpath:texinfo-section-pattern 688,31621
-(defun hpath:abbreviate-file-name 696,31978
-(defun hpath:absolute-arguments 703,32228
-(defun hpath:absolute-to 727,33167
-(defun hpath:tramp-file-name-regexp 766,34549
-(defun hpath:remote-at-p 780,35189
-(defun hpath:remote-p 848,37983
-(defun hpath:at-p 919,40545
-(defun hpath:call 969,42941
-(defun hpath:is-path-variable-p 1064,47420
-(defun hpath:choose-from-path-variable 1071,47720
-(defun hpath:delimited-possible-path 1088,48608
-(defun hpath:display-buffer 1140,50937
-(defun hpath:display-buffer-other-frame 1156,51673
-(defun hpath:display-buffer-function 1177,52468
-(defun hpath:display-path-function 1182,52724
-(defun hpath:resolve 1187,52975
-(defun hpath:expand 1209,53989
-(defun hpath:prepend-shell-directory 1238,55461
-(defvar hpath:compressed-suffix-regexp 1272,57259
-(defun hpath:expand-with-variable 1275,57415
-(defun hpath:file-line-and-column 1313,59134
-(defun hpath:find-noselect 1331,60011
-(defun hpath:find 1340,60360
-(defun hpath:to-markup-anchor 1508,67269
-(defun hpath:find-executable 1572,70008
-(defun hpath:find-line 1587,70512
-(defun hpath:find-other-frame 1607,71282
-(defun hpath:find-other-window 1622,71760
-(defun hpath:get-external-display-alist 1632,72255
-(defun hpath:is-p 1651,73244
-(defun hpath:push-tag-mark 1752,78057
-(defun hpath:relative-arguments 1766,78569
-(defun hpath:relative-to 1776,78999
-(defun hpath:rfc 1808,80287
-(defun hpath:start-end 1813,80460
-(defun hpath:return-one-value 1842,81664
-(defun hpath:substitute-value 1880,83345
-(defun hpath:substitute-var 1924,85000
-(defun hpath:symlink-referent 1962,86466
-(defun hpath:symlink-expand 1977,87061
-(defun hpath:to-line 2012,88700
-(defun hpath:trim 2021,88987
-(defun hpath:normalize 2030,89325
-(defun hpath:validate 2035,89544
-(defun hpath:find-file-urls-p 2058,90451
-(defun hpath:handle-urls 2064,90710
-(defalias
'hyperb:substitute-in-file-namehyperb:substitute-in-file-name2081,91452
-(defun substitute-in-file-name 2084,91543
-(defun hpath:enable-find-file-urls 2097,92185
-(defun hpath:disable-find-file-urls 2128,93315
-(defun hpath:find-file-urls-mode 2157,94350
-(defun hpath:url-at-p 2169,94837
-(defun hpath:url-p 2180,95328
-(defun hpath:www-at-p 2191,95723
-(defun hpath:www-p 2207,96420
-(defun hpath:command-string 2215,96743
-(defun hpath:display-where-function 2224,97150
-(defun hpath:remote-available-p 2234,97620
-(defun hpath:remote-default-user 2253,98467
-(defun hpath:delete-trailer 2267,98923
-(defun hpath:exists-p 2275,99207
-(defun hpath:find-file-mailcap 2306,100204
-(defun hpath:find-program 2322,100720
-(defun hpath:match 2343,101591
-(defun hpath:get-single-string-variable-value 2357,102191
-(defun hpath:substitute-dir 2387,103285
-(defun hpath:substitute-match-value 2453,106368
-(defun hpath:substitute-var-name 2515,108584
+(defvar hpath:display-where 477,21518
+(defvar hpath:display-where-alist483,21796
+(defcustom hpath:native-image-suffixes 515,23143
+(defcustom hpath:variables535,24107
+(defvar hpath:rfc 547,24678
+(defcustom hpath:suffixes 550,24815
+(defvar hpath:tmp-prefix 556,25032
+(defvar hpath:url-regexp 565,25527
+(defvar hpath:url-hostnames-regexp 577,26315
+(defvar hpath:url-regexp2580,26472
+(defvar hpath:url-regexp3597,27351
+(defconst hpath:url-keyword-grpn 614,28228
+(defconst hpath:url-grpn 617,28363
+(defconst hpath:protocol-grpn 619,28471
+(defconst hpath:username-grpn 621,28586
+(defconst hpath:sitename-grpn 623,28703
+(defconst hpath:hostname-grpn 626,28824
+(defconst hpath:portnumber-grpn 629,28991
+(defconst hpath:pathname-grpn 632,29119
+(defvar hpath:string-url-regexp 636,29246
+(defvar hpath:string-url-regexp2 641,29481
+(defvar hpath:string-url-regexp3 646,29724
+(defconst hpath:html-anchor-id-pattern 655,30144
+(defconst hpath:markdown-anchor-id-pattern 659,30322
+(defconst hpath:markdown-section-pattern 663,30487
+(defconst hpath:markdown-suffix-regexp 667,30690
+(defconst hpath:outline-section-pattern 670,30796
+(defvar hpath:prefix-regexp 674,31023
+(defvar hpath:remote-regexp681,31330
+(defconst hpath:shell-modes 685,31497
+(defconst hpath:texinfo-section-pattern 688,31641
+(defun hpath:abbreviate-file-name 696,31998
+(defun hpath:absolute-arguments 703,32248
+(defun hpath:absolute-to 727,33187
+(defun hpath:tramp-file-name-regexp 766,34569
+(defun hpath:remote-at-p 780,35209
+(defun hpath:remote-p 848,38003
+(defun hpath:at-p 919,40565
+(defun hpath:call 969,42961
+(defun hpath:is-path-variable-p 1064,47440
+(defun hpath:choose-from-path-variable 1071,47740
+(defun hpath:delimited-possible-path 1088,48628
+(defun hpath:display-buffer 1140,50957
+(defun hpath:display-buffer-other-frame 1156,51693
+(defun hpath:display-buffer-function 1177,52488
+(defun hpath:display-path-function 1182,52744
+(defun hpath:resolve 1187,52995
+(defun hpath:expand 1209,54009
+(defun hpath:prepend-shell-directory 1238,55481
+(defvar hpath:compressed-suffix-regexp 1272,57279
+(defun hpath:expand-with-variable 1275,57435
+(defun hpath:file-line-and-column 1313,59154
+(defun hpath:find-noselect 1331,60031
+(defun hpath:find 1340,60380
+(defun hpath:to-markup-anchor 1505,67368
+(defun hpath:find-executable 1569,70107
+(defun hpath:find-line 1584,70611
+(defun hpath:find-other-frame 1604,71381
+(defun hpath:find-other-window 1619,71859
+(defun hpath:get-external-display-alist 1629,72354
+(defun hpath:is-p 1648,73343
+(defun hpath:push-tag-mark 1749,78156
+(defun hpath:relative-arguments 1763,78668
+(defun hpath:relative-to 1773,79098
+(defun hpath:rfc 1805,80386
+(defun hpath:start-end 1810,80559
+(defun hpath:return-one-value 1839,81763
+(defun hpath:substitute-value 1877,83444
+(defun hpath:substitute-var 1921,85099
+(defun hpath:symlink-referent 1959,86565
+(defun hpath:symlink-expand 1974,87160
+(defun hpath:to-line 2009,88799
+(defun hpath:trim 2018,89086
+(defun hpath:normalize 2027,89424
+(defun hpath:validate 2035,89810
+(defun hpath:find-file-urls-p 2058,90717
+(defun hpath:handle-urls 2064,90976
+(defalias
'hyperb:substitute-in-file-namehyperb:substitute-in-file-name2081,91718
+(defun substitute-in-file-name 2084,91809
+(defun hpath:enable-find-file-urls 2097,92451
+(defun hpath:disable-find-file-urls 2128,93581
+(defun hpath:find-file-urls-mode 2157,94616
+(defun hpath:url-at-p 2169,95103
+(defun hpath:url-p 2180,95594
+(defun hpath:www-at-p 2191,95989
+(defun hpath:www-p 2207,96686
+(defun hpath:command-string 2215,97009
+(defun hpath:display-where-function 2224,97416
+(defun hpath:remote-available-p 2234,97886
+(defun hpath:remote-default-user 2253,98733
+(defun hpath:delete-trailer 2267,99189
+(defun hpath:exists-p 2275,99473
+(defun hpath:find-file-mailcap 2306,100470
+(defun hpath:find-program 2322,100986
+(defun hpath:match 2343,101857
+(defun hpath:get-single-string-variable-value 2357,102457
+(defun hpath:substitute-dir 2387,103551
+(defun hpath:substitute-match-value 2453,106634
+(defun hpath:substitute-var-name 2515,108850
hrmail.el,723
(defun Rmail-init 47,1512
@@ -938,40 +938,40 @@ hsmail.el,177
(defun message--yank-original-internal 78,3024
(defun mail-yank-original 141,5261
-hsys-org.el,1408
-(defun hsys-org-meta-return-shared-p 41,1262
-(defun hsys-org-meta-return 51,1710
-(defcustom hsys-org-enable-smart-keys 59,1972
-(defvar hsys-org-mode-function 92,3719
-(defact org-link 99,4032
-(defact org-internal-target-link 106,4291
-(defact org-radio-target-link 121,4999
-(defun hsys-org-mode-p 141,5842
-(defun hsys-org-cycle 148,6113
-(defun hsys-org-get-value 153,6263
-(defun hsys-org-global-cycle 162,6628
-(defun hsys-org-todo-cycle 167,6803
-(defun hsys-org-todo-set-cycle 172,6955
-(defun hsys-org-todo-occur 178,7161
-(defun hsys-org-region-with-text-property-value 189,7651
-(defun hsys-org-agenda-item-at-p 204,8379
-(defun hsys-org-block-start-at-p 209,8564
-(defun hsys-org-src-block-start-at-p 217,8829
-(defun hsys-org-link-at-p 224,9074
-(defun hsys-org-heading-at-p 232,9449
-(defun hsys-org-target-at-p 238,9674
-(defun hsys-org-todo-at-p 246,10051
-(defun hsys-org-radio-target-link-at-p 252,10269
-(defun hsys-org-radio-target-def-at-p 260,10657
-(defun hsys-org-radio-target-at-p 272,11192
-(defun hsys-org-internal-target-link-at-p 279,11519
-(defun hsys-org-internal-target-def-at-p 287,11919
-(defun hsys-org-internal-target-at-p 299,12449
-(defun hsys-org-face-at-p 306,12787
-(defun hsys-org-search-internal-link-p 315,13149
-(defun hsys-org-search-radio-target-link-p 338,14086
-(defun hsys-org-set-ibut-label 359,14911
-(defun hsys-org-to-next-radio-target-link 368,15241
+hsys-org.el,1411
+(defun hsys-org-meta-return-shared-p 42,1288
+(defun hsys-org-meta-return 52,1736
+(defcustom hsys-org-enable-smart-keys 60,1998
+(defvar hsys-org-mode-function 97,3927
+(defact org-link 104,4240
+(defact org-internal-target-link 111,4499
+(defact org-radio-target-link 126,5207
+(defun hsys-org-mode-p 146,6050
+(defun hsys-org-cycle 153,6321
+(defun hsys-org-get-value 158,6471
+(defun hsys-org-global-cycle 167,6836
+(defun hsys-org-todo-cycle 172,7011
+(defun hsys-org-todo-set-cycle 177,7163
+(defun hsys-org-todo-occur 183,7369
+(defun hsys-org-region-with-text-property-value 194,7859
+(defun hsys-org-agenda-item-at-p 209,8587
+(defun hsys-org-block-start-at-p 214,8772
+(defun hsys-org-src-block-start-at-p 222,9037
+(defun hsys-org-link-at-p 242,9855
+(defun hsys-org-heading-at-p 251,10267
+(defun hsys-org-target-at-p 257,10492
+(defun hsys-org-todo-at-p 265,10869
+(defun hsys-org-radio-target-link-at-p 271,11087
+(defun hsys-org-radio-target-def-at-p 278,11447
+(defun hsys-org-radio-target-at-p 290,11982
+(defun hsys-org-internal-target-link-at-p 297,12309
+(defun hsys-org-internal-target-def-at-p 305,12709
+(defun hsys-org-internal-target-at-p 317,13239
+(defun hsys-org-face-at-p 324,13577
+(defun hsys-org-search-internal-link-p 334,13962
+(defun hsys-org-search-radio-target-link-p 356,14812
+(defun hsys-org-set-ibut-label 375,15528
+(defun hsys-org-to-next-radio-target-link 383,15857
hsys-org-roam.el,43
(defun hsys-org-roam-consult-grep 39,1257
@@ -1272,75 +1272,75 @@ hui-mouse.el,3113
(defcustom assist-key-eol-function 120,4604
(defvar hkey-value 194,7730
(defvar hkey-alist197,7827
-(defvar hmouse-alist 525,20952
-(defun first-line-p 556,22185
-(defun last-line-p 560,22317
-(defun smart-completion-help 564,22447
-(defun smart-buffer-menu-no-marks 573,22845
-(defun smart-buffer-menu 586,23317
-(defun smart-buffer-menu-assist 615,24387
-(defun smart-ibuffer-menu-no-marks 643,25481
-(defun smart-ibuffer-menu 656,25956
-(defun smart-ibuffer-menu-assist 683,26967
-(defun smart-custom 713,28140
-(defun smart-custom-assist 734,28985
-(defun smart-calendar 762,30035
-(defun smart-calendar-assist 783,30858
-(defun smart-company-to-definition 812,32061
-(defun smart-company-help 820,32380
-(defun smart-dired-pathname-up-to-point 833,32876
-(defun smart-dired 850,33442
-(defun smart-dired-assist 895,35366
-(defun smart-gnus-group 928,36645
-(defun smart-gnus-group-assist 950,37564
-(defun smart-gnus-summary 972,38542
-(defun smart-gnus-summary-assist 1002,39799
-(defun smart-gnus-article 1024,40745
-(defun smart-gnus-article-assist 1047,41749
-(defun smart-helm-at-header 1075,42969
-(defun smart-helm-get-current-action 1084,43310
-(defun smart-helm-line-has-action 1094,43791
-(defun smart-helm-alive-p 1112,44582
-(defun smart-helm-resume-helm 1120,44888
-(defun smart-helm-at 1129,45223
-(defun smart-helm-to-minibuffer 1161,46340
-(defun smart-helm(1166,46499
-(defun smart-helm-assist(1217,48748
-(defun smart-hmail 1281,51539
-(defun smart-hmail-assist 1314,52749
-(defun smart-hyrolo 1352,54171
-(defalias 'smart-hyrolo-assist smart-hyrolo-assist1362,54514
-(defun smart-image-dired-thumbnail 1368,54749
-(defun smart-image-dired-thumbnail-assist 1373,54979
-(defun smart-imenu-display-item-where 1383,55435
-(defun smart-imenu-item-at-p 1389,55743
-(defun smart-imenu-item-p 1407,56717
-(defun smart-magit-display-file 1453,58802
-(defun smart-magit 1462,59214
-(defun smart-magit-assist 1487,60198
-(defun smart-magit-tab 1518,61508
-(defun smart-apropos 1554,63019
-(defun smart-apropos-assist 1574,63733
-(defun smart-man-display 1594,64510
-(defun smart-man-entry-ref 1598,64650
-(defun smart-man-c-routine-ref 1640,66172
-(defun smart-man-file-ref 1661,67031
-(defun smart-org 1685,67814
-(defvar smart-outline-cut 1842,73528
-(defun smart-outline-level 1854,73959
-(defun smart-outline 1863,74213
-(defun smart-outline-assist 1902,75600
-(defun smart-outline-to-entry-end 1938,77043
-(defun smart-outline-subtree-hidden-p 1948,77398
-(defun smart-outline-char-invisible-p 1954,77653
-(defun smart-todotxt 1970,78333
-(defun smart-todotxt-assist 1980,78612
-(defun smart-eobp 1991,78908
-(defun smart-eolp 2001,79272
-(defun smart-push-button 2014,79859
-(defun smart-push-button-help 2026,80477
-(defun smart-tar 2044,81226
-(defun smart-tar-assist 2069,82040
+(defvar hmouse-alist 528,21008
+(defun first-line-p 559,22241
+(defun last-line-p 563,22373
+(defun smart-completion-help 567,22503
+(defun smart-buffer-menu-no-marks 576,22901
+(defun smart-buffer-menu 589,23373
+(defun smart-buffer-menu-assist 618,24443
+(defun smart-ibuffer-menu-no-marks 646,25537
+(defun smart-ibuffer-menu 659,26012
+(defun smart-ibuffer-menu-assist 686,27023
+(defun smart-custom 716,28196
+(defun smart-custom-assist 737,29041
+(defun smart-calendar 765,30091
+(defun smart-calendar-assist 786,30914
+(defun smart-company-to-definition 815,32117
+(defun smart-company-help 823,32436
+(defun smart-dired-pathname-up-to-point 836,32932
+(defun smart-dired 853,33498
+(defun smart-dired-assist 898,35422
+(defun smart-gnus-group 931,36701
+(defun smart-gnus-group-assist 953,37620
+(defun smart-gnus-summary 975,38598
+(defun smart-gnus-summary-assist 1005,39855
+(defun smart-gnus-article 1027,40801
+(defun smart-gnus-article-assist 1050,41805
+(defun smart-helm-at-header 1078,43025
+(defun smart-helm-get-current-action 1087,43366
+(defun smart-helm-line-has-action 1097,43847
+(defun smart-helm-alive-p 1115,44638
+(defun smart-helm-resume-helm 1123,44944
+(defun smart-helm-at 1132,45279
+(defun smart-helm-to-minibuffer 1164,46396
+(defun smart-helm(1169,46555
+(defun smart-helm-assist(1220,48804
+(defun smart-hmail 1284,51595
+(defun smart-hmail-assist 1317,52805
+(defun smart-hyrolo 1355,54227
+(defalias 'smart-hyrolo-assist smart-hyrolo-assist1365,54570
+(defun smart-image-dired-thumbnail 1371,54805
+(defun smart-image-dired-thumbnail-assist 1376,55035
+(defun smart-imenu-display-item-where 1386,55491
+(defun smart-imenu-item-at-p 1392,55799
+(defun smart-imenu-item-p 1410,56781
+(defun smart-magit-display-file 1456,58866
+(defun smart-magit 1465,59278
+(defun smart-magit-assist 1490,60262
+(defun smart-magit-tab 1521,61572
+(defun smart-apropos 1557,63083
+(defun smart-apropos-assist 1577,63797
+(defun smart-man-display 1597,64574
+(defun smart-man-entry-ref 1601,64714
+(defun smart-man-c-routine-ref 1643,66236
+(defun smart-man-file-ref 1664,67095
+(defun smart-org 1688,67878
+(defvar smart-outline-cut 1845,73592
+(defun smart-outline-level 1857,74023
+(defun smart-outline 1866,74277
+(defun smart-outline-assist 1905,75664
+(defun smart-outline-to-entry-end 1941,77107
+(defun smart-outline-subtree-hidden-p 1951,77462
+(defun smart-outline-char-invisible-p 1957,77717
+(defun smart-todotxt 1973,78397
+(defun smart-todotxt-assist 1983,78676
+(defun smart-eobp 1994,78972
+(defun smart-eolp 2004,79336
+(defun smart-push-button 2017,79923
+(defun smart-push-button-help 2029,80541
+(defun smart-tar 2047,81290
+(defun smart-tar-assist 2072,82104
hui-select.el,2783
(defcustom hui-select-brace-modes121,5691
@@ -1413,7 +1413,7 @@ hui-treemacs.el,72
(defun smart-treemacs 62,2340
(defun smart-treemacs-modeline 103,4032
-hui-window.el,3314
+hui-window.el,3315
(defcustom action-key-minibuffer-function 39,1323
(defcustom assist-key-minibuffer-function 45,1579
(defcustom action-key-modeline-function 53,1952
@@ -1421,75 +1421,75 @@ hui-window.el,3314
(defun hmouse-map-modes-to-form 63,2337
(defvar hmouse-drag-item-mode-forms74,2756
(defcustom hmouse-pulse-flag 100,3959
-(defvar hmouse-edge-sensitivity 109,4284
-(defvar hmouse-side-sensitivity 112,4403
-(defvar hmouse-x-drag-sensitivity 116,4569
-(defvar hmouse-y-drag-sensitivity 121,4804
-(defvar hmouse-x-diagonal-sensitivity 126,5027
-(defvar hmouse-y-diagonal-sensitivity 130,5265
-(defun hmouse-alist-add-window-handlers 146,5854
-(defun hmouse-at-item-p 228,9849
-(defun hmouse-context-menu 242,10362
-(defun hmouse-context-ibuffer-menu 261,10994
-(defun hmouse-prior-active-region 280,11634
-(defun hmouse-dired-readin-hook 292,12184
-(define-minor-mode hmouse-dired-display-here-mode297,12382
-(defun hmouse-drag-region-active 317,13418
-(defun hmouse-drag-thing 327,13818
-(defun hmouse-kill-region 381,16504
-(defun hmouse-kill-and-yank-region 394,17140
-(defun hmouse-yank-region 432,19073
-(defun hmouse-drag-between-frames 454,20139
-(defun hmouse-drag-between-windows 467,20739
-(defun hmouse-press-release-same-window 479,21277
-(defun hmouse-drag-outside-all-windows 490,21799
-(defun hmouse-drag-item-to-display 497,22170
-(defun hmouse-drag-same-window 519,23047
-(defun hmouse-drag-diagonally 524,23300
-(defun hmouse-drag-horizontally 556,24805
-(defun hmouse-drag-vertically-within-emacs 584,26235
-(defun hmouse-drag-vertically 613,27731
-(defun hmouse-drag-window-side 621,28093
-(defun hmouse-read-only-toggle-key 640,29038
-(defun hmouse-vertical-action-drag 644,29219
-(defun hmouse-vertical-assist-drag 654,29591
-(defun hmouse-horizontal-action-drag 662,29922
-(defun hmouse-horizontal-assist-drag 674,30356
-(defun smart-coords-in-window-p 682,30692
-(defun smart-point-of-coords 704,31405
-(defun smart-window-of-coords 712,31650
-(defun hmouse-split-window 735,32464
-(defun hmouse-buffer-to-window 743,32725
-(defun hmouse-drag-not-allowed 754,33245
-(defun hmouse-set-buffer-and-point 760,33597
-(defun hmouse-goto-region-prev-point 765,33724
-(defun hmouse-goto-depress-point 775,34174
-(defun hmouse-goto-release-point 781,34520
-(defun hmouse-inactive-minibuffer-p 787,34865
-(defun hmouse-insert-region 795,35231
-(defun hmouse-pulse-buffer 808,35737
-(defun hmouse-pulse-line 813,35934
-(defun hmouse-pulse-region 818,36111
-(defun hmouse-item-to-window 822,36284
-(defun action-key-modeline 893,39288
-(defun assist-key-modeline 928,41004
-(defun hmouse-drag-p 967,42865
-(defun hmouse-modeline-click 980,43392
-(defun hmouse-emacs-modeline-event-p 989,43788
-(defun hmouse-modeline-event-p 1003,44620
-(defun hmouse-modeline-depress 1010,44878
-(defun hmouse-modeline-release 1018,45167
-(defun hmouse-emacs-at-modeline-buffer-id-p 1025,45394
-(defun hmouse-modeline-resize-window 1036,45976
-(defun hmouse-clone-window-to-frame 1052,46574
-(defun hmouse-move-window-to-frame 1057,46751
-(defun hmouse-release-left-edge 1090,48162
-(defun hmouse-release-right-edge 1108,48980
-(defun hmouse-resize-window-side 1121,49527
-(defun hmouse-swap-buffers 1157,50919
-(defun hmouse-swap-windows 1172,51545
-(defun hmouse-x-coord 1200,52637
-(defun hmouse-y-coord 1224,53434
+(defvar hmouse-edge-sensitivity 109,4302
+(defvar hmouse-side-sensitivity 112,4421
+(defvar hmouse-x-drag-sensitivity 116,4587
+(defvar hmouse-y-drag-sensitivity 121,4822
+(defvar hmouse-x-diagonal-sensitivity 126,5045
+(defvar hmouse-y-diagonal-sensitivity 130,5283
+(defun hmouse-alist-add-window-handlers 146,5872
+(defun hmouse-at-item-p 234,10222
+(defun hmouse-context-menu 250,10818
+(defun hmouse-context-ibuffer-menu 269,11450
+(defun hmouse-prior-active-region 288,12090
+(defun hmouse-dired-readin-hook 300,12640
+(define-minor-mode hmouse-dired-display-here-mode305,12838
+(defun hmouse-drag-region-active 325,13874
+(defun hmouse-drag-thing 335,14274
+(defun hmouse-kill-region 389,16960
+(defun hmouse-kill-and-yank-region 402,17596
+(defun hmouse-yank-region 440,19529
+(defun hmouse-drag-between-frames 462,20595
+(defun hmouse-drag-between-windows 475,21195
+(defun hmouse-press-release-same-window 486,21727
+(defun hmouse-drag-outside-all-windows 497,22249
+(defun hmouse-drag-item-to-display 504,22620
+(defun hmouse-drag-same-window 527,23511
+(defun hmouse-drag-diagonally 532,23764
+(defun hmouse-drag-horizontally 564,25269
+(defun hmouse-drag-vertically-within-emacs 592,26699
+(defun hmouse-drag-vertically 621,28195
+(defun hmouse-drag-window-side 629,28557
+(defun hmouse-read-only-toggle-key 648,29502
+(defun hmouse-vertical-action-drag 652,29683
+(defun hmouse-vertical-assist-drag 662,30055
+(defun hmouse-horizontal-action-drag 670,30386
+(defun hmouse-horizontal-assist-drag 682,30820
+(defun smart-coords-in-window-p 690,31156
+(defun smart-point-of-coords 712,31869
+(defun smart-window-of-coords 720,32114
+(defun hmouse-split-window 743,32928
+(defun hmouse-buffer-to-window 751,33189
+(defun hmouse-drag-not-allowed 762,33709
+(defun hmouse-set-buffer-and-point 768,34061
+(defun hmouse-goto-region-prev-point 773,34188
+(defun hmouse-goto-depress-point 783,34638
+(defun hmouse-goto-release-point 789,34984
+(defun hmouse-inactive-minibuffer-p 795,35329
+(defun hmouse-insert-region 803,35695
+(defun hmouse-pulse-buffer 816,36201
+(defun hmouse-pulse-line 821,36398
+(defun hmouse-pulse-region 826,36575
+(defun hmouse-item-to-window 830,36748
+(defun action-key-modeline 901,39752
+(defun assist-key-modeline 936,41468
+(defun hmouse-drag-p 975,43329
+(defun hmouse-modeline-click 988,43856
+(defun hmouse-emacs-modeline-event-p 997,44252
+(defun hmouse-modeline-event-p 1011,45084
+(defun hmouse-modeline-depress 1018,45342
+(defun hmouse-modeline-release 1026,45631
+(defun hmouse-emacs-at-modeline-buffer-id-p 1033,45858
+(defun hmouse-modeline-resize-window 1044,46440
+(defun hmouse-clone-window-to-frame 1060,47038
+(defun hmouse-move-window-to-frame 1065,47215
+(defun hmouse-release-left-edge 1098,48626
+(defun hmouse-release-right-edge 1116,49444
+(defun hmouse-resize-window-side 1129,49991
+(defun hmouse-swap-buffers 1165,51383
+(defun hmouse-swap-windows 1180,52009
+(defun hmouse-x-coord 1208,53101
+(defun hmouse-y-coord 1232,53898
hui.el,2327
(defcustom hui:hbut-delete-confirm-flag 39,1219
@@ -1502,58 +1502,58 @@ hui.el,2327
(defun hui:delimited-selectable-thing-and-bounds 244,9693
(defun hui:ebut-act 267,10737
(defun hui:ebut-create 282,11261
-(defun hui:ebut-delete 314,12573
-(defun hui:ebut-edit-region 339,13713
-(defun hui:ebut-edit 359,14611
-(defun hui:ebut-rename 408,16410
-(defun hui:ebut-search 470,18926
-(defun hui:gbut-create 506,20353
-(defun hui:gbut-delete 548,22066
-(defun hui:gbut-edit 563,22716
-(defun hui:gbut-rename 652,26157
-(defun hui:gibut-create 664,26620
-(defun hui:hbut-act 692,27660
-(defun hui:hbut-buf 700,28033
-(defun hui:hbut-current-act 725,28795
-(defun hui:hbut-delete 735,29169
-(defun hui:hbut-help 775,30942
-(defun hui:hbut-label 816,32428
-(defun hui:hbut-label-default 827,32925
-(defun hui:hbut-rename 842,33660
-(defun hui:hbut-report 852,34016
-(defalias 'hui:hbut-summarize hui:hbut-summarize863,34368
-(defun hui:ibut-act 865,34418
-(defun hui:ibut-create 880,34984
-(defun hui:ibut-edit 911,36279
-(defun hui:ibut-label-create 981,38956
-(defun hui:ibut-rename 1019,40831
-(defun hui:link 1053,41988
-(defun hui:ebut-link-directly 1057,42148
-(defun hui:ibut-link-directly 1128,44983
-(defun hui:action 1206,48131
-(defun hui:actype 1259,49864
-(defun hui:buf-writable-err 1278,50857
-(defvar hui:ignore-buffers-regexp 1298,51720
-(defun hui:ebut-delete-op 1301,51890
-(defun hui:ebut-message 1332,53143
-(defun hui:ebut-unmark 1343,53547
-(defun hui:file-find 1403,56010
-(defun hui:hbut-operate 1410,56280
-(defun hui:hbut-term-highlight 1435,57395
-(defun hui:hbut-term-unhighlight 1449,57797
-(defun hui:help-ebut-highlight 1458,58083
-(defun hui:htype-delete 1464,58331
-(defun hui:htype-help 1475,58738
-(defun hui:htype-help-current-window 1526,60506
-(defun hui:ibut-delete-op 1533,60871
-(defun hui:ibut-message 1557,61974
-(defun hui:key-dir 1568,62378
-(defun hui:key-src 1577,62726
-(defun hui:ebut-link-create 1586,63097
-(defun hui:ibut-link-create 1608,64251
-(defun hui:link-possible-types 1630,65405
-(defun hui:list-remove-text-properties 1763,70773
-(defvar hui:ebut-label-prev 1773,71163
+(defun hui:ebut-delete 315,12617
+(defun hui:ebut-edit-region 340,13757
+(defun hui:ebut-edit 360,14655
+(defun hui:ebut-rename 409,16454
+(defun hui:ebut-search 471,18970
+(defun hui:gbut-create 507,20397
+(defun hui:gbut-delete 549,22110
+(defun hui:gbut-edit 564,22760
+(defun hui:gbut-rename 653,26201
+(defun hui:gibut-create 665,26664
+(defun hui:hbut-act 693,27704
+(defun hui:hbut-buf 701,28077
+(defun hui:hbut-current-act 726,28839
+(defun hui:hbut-delete 736,29213
+(defun hui:hbut-help 776,30986
+(defun hui:hbut-label 817,32472
+(defun hui:hbut-label-default 828,32969
+(defun hui:hbut-rename 843,33704
+(defun hui:hbut-report 853,34060
+(defalias 'hui:hbut-summarize hui:hbut-summarize864,34412
+(defun hui:ibut-act 866,34462
+(defun hui:ibut-create 881,35028
+(defun hui:ibut-edit 914,36404
+(defun hui:ibut-label-create 984,39081
+(defun hui:ibut-rename 1022,40956
+(defun hui:link 1056,42113
+(defun hui:ebut-link-directly 1060,42273
+(defun hui:ibut-link-directly 1131,45108
+(defun hui:action 1209,48256
+(defun hui:actype 1262,49989
+(defun hui:buf-writable-err 1281,50982
+(defvar hui:ignore-buffers-regexp 1301,51845
+(defun hui:ebut-delete-op 1304,52015
+(defun hui:ebut-message 1335,53268
+(defun hui:ebut-unmark 1346,53672
+(defun hui:file-find 1406,56135
+(defun hui:hbut-operate 1413,56405
+(defun hui:hbut-term-highlight 1438,57520
+(defun hui:hbut-term-unhighlight 1452,57922
+(defun hui:help-ebut-highlight 1461,58208
+(defun hui:htype-delete 1467,58456
+(defun hui:htype-help 1478,58863
+(defun hui:htype-help-current-window 1529,60631
+(defun hui:ibut-delete-op 1536,60996
+(defun hui:ibut-message 1560,62099
+(defun hui:key-dir 1571,62503
+(defun hui:key-src 1580,62851
+(defun hui:ebut-link-create 1589,63222
+(defun hui:ibut-link-create 1612,64421
+(defun hui:link-possible-types 1635,65620
+(defun hui:list-remove-text-properties 1768,70988
+(defvar hui:ebut-label-prev 1778,71378
hvar.el,272
(defvar var::append-list 34,1095
@@ -1570,14 +1570,14 @@ hversion.el,450
(defvar hyperb:mouse-buttons32,961
(defvar hyperb:automount-prefixes40,1250
(defun hyperb:stack-frame 56,1894
-(defun hyperb:path-being-loaded 96,3434
-(defun hyperb:window-sys-term 123,4375
-(defun hyperb:window-system 145,5393
-(defalias 'id-browse-file id-browse-file165,6303
-(defun id-info 168,6370
-(defun id-info-item 184,6984
-(defalias 'id-tool-quit id-tool-quit212,8235
-(defun id-tool-invoke 215,8305
+(defun hyperb:path-being-loaded 96,3438
+(defun hyperb:window-sys-term 123,4385
+(defun hyperb:window-system 145,5403
+(defalias 'id-browse-file id-browse-file165,6313
+(defun id-info 168,6380
+(defun id-info-item 184,6994
+(defalias 'id-tool-quit id-tool-quit212,8245
+(defun id-tool-invoke 215,8315
hvm.el,874
(defvar vm-edit-message-mode 55,1694
@@ -1607,71 +1607,71 @@ hvm.el,874
(defvar Vm-msg-start-regexp 537,19555
hypb.el,2566
-(defconst hypb:help-buf-prefix 28,889
-(defcustom hypb:rgrep-command32,1035
-(defun hypb:activate-interaction-log-mode 81,2925
-(defmacro hypb:assert-same-start-and-end-buffer 169,6628
-(defun hypb:call-process-p 186,7430
-(defun hypb:char-count 208,8265
-(defun hypb:chmod 216,8495
-(defun hypb:cmd-key-series 226,8929
-(defun hypb:cmd-key-vector 244,9663
-(defun hypb:installation-type 253,10038
-(defun hypb:configuration 295,12161
-(defun hypb:debug 342,14573
-(defun hypb:decode-url 357,15090
-(defun hypb:def-to-buffer 384,16246
-(defun hypb:devdocs-lookup 400,16837
-(defun hypb:domain-name 408,17117
-(defun hypb:error 438,18375
-(defun hypb:fgrep-git-log 447,18664
-(defun hypb:fgrep-git-log-activate 455,19071
-(define-derived-mode hypb:fgrep-git-log-mode 462,19348
-(defun hypb:file-major-mode 468,19695
-(defun hypb:filter-directories 478,20087
-(defun hypb:format-args 493,20748
-(defun hypb:format-quote 497,20930
-(defun hypb:get-completion 511,21404
-(defun hypb:get-raw-syntax-descriptor 534,22444
-(defun hypb:glob-to-regexp 539,22663
-(defun hypb:goto-marker 550,23121
-(defun hypb:grep-git-log 568,23762
-(defun hypb:help-buf-name 575,24137
-(defun hypb:helm-apropos 584,24508
-(defun hypb:helm-info 593,24852
-(defun hypb:hkey-help-file 601,25171
-(defun hypb:indirect-function 615,25724
-(defun hypb:insert-region 629,26276
-(defun hypb:locate 646,27047
-(defun hypb:map-plist 678,28430
-(defun hypb:map-vector 684,28649
-(defun hypb:mark-object 697,29135
-(defun hypb:maximize-window-height 707,29524
-(defun hypb:object-p 720,30005
-(defun hypb:readable-directories 727,30255
-(defun hypb:require-package 737,30691
-(defun hypb:remove-lines 750,31285
-(defun hypb:return-process-output 756,31515
-(defun hypb:rgrep 775,32222
-(defun hypb:save-lines 812,33935
-(defmacro hypb:save-selected-window-and-input-focus 818,34163
-(defun hypb:select-window-frame 825,34492
-(defun hypb:set-raw-syntax-descriptor 832,34808
-(defun hypb:straight-package-plist 846,35409
-(defun hypb:string-count-matches 856,35933
-(defun hypb:supercite-p 884,36941
-(defun hypb:toggle-isearch-invisible 898,37392
-(defun hypb:uuid 918,38316
-(defun hypb:user-name 942,38905
-(defun hypb:window-list 948,39130
-(defvar hypb:home-page 959,39702
-(defvar hypb:hyperbole-banner-keymap962,39806
-(defun hypb:display-file-with-logo 971,40122
-(defun hypb:browse-home-page 993,41118
-(defun hypb:insert-hyperbole-banner 1003,41443
-(defun hypb:locate-pathnames 1034,42861
-(defun hypb:oct-to-int 1042,43166
-(define-button-type 'hyperbole-banner)hyperbole-banner1059,43750
+(defconst hypb:help-buf-prefix 28,890
+(defcustom hypb:rgrep-command32,1036
+(defun hypb:activate-interaction-log-mode 81,2926
+(defmacro hypb:assert-same-start-and-end-buffer 169,6629
+(defun hypb:call-process-p 186,7431
+(defun hypb:char-count 208,8266
+(defun hypb:chmod 216,8496
+(defun hypb:cmd-key-series 226,8930
+(defun hypb:cmd-key-vector 244,9664
+(defun hypb:installation-type 253,10039
+(defun hypb:configuration 295,12162
+(defun hypb:debug 342,14574
+(defun hypb:decode-url 357,15091
+(defun hypb:def-to-buffer 384,16247
+(defun hypb:devdocs-lookup 400,16838
+(defun hypb:domain-name 408,17118
+(defun hypb:error 438,18376
+(defun hypb:fgrep-git-log 447,18665
+(defun hypb:fgrep-git-log-activate 455,19072
+(define-derived-mode hypb:fgrep-git-log-mode 462,19349
+(defun hypb:file-major-mode 468,19696
+(defun hypb:filter-directories 478,20088
+(defun hypb:format-args 493,20749
+(defun hypb:format-quote 497,20931
+(defun hypb:get-completion 511,21405
+(defun hypb:get-raw-syntax-descriptor 534,22445
+(defun hypb:glob-to-regexp 539,22664
+(defun hypb:goto-marker 550,23122
+(defun hypb:grep-git-log 568,23763
+(defun hypb:help-buf-name 575,24138
+(defun hypb:helm-apropos 584,24509
+(defun hypb:helm-info 593,24853
+(defun hypb:hkey-help-file 601,25172
+(defun hypb:indirect-function 615,25725
+(defun hypb:insert-region 629,26277
+(defun hypb:locate 646,27048
+(defun hypb:map-plist 678,28431
+(defun hypb:map-vector 684,28650
+(defun hypb:mark-object 697,29136
+(defun hypb:maximize-window-height 707,29525
+(defun hypb:object-p 720,30006
+(defun hypb:readable-directories 727,30256
+(defun hypb:require-package 737,30692
+(defun hypb:remove-lines 750,31286
+(defun hypb:return-process-output 756,31516
+(defun hypb:rgrep 775,32223
+(defun hypb:save-lines 812,33936
+(defmacro hypb:save-selected-window-and-input-focus 818,34164
+(defun hypb:select-window-frame 825,34493
+(defun hypb:set-raw-syntax-descriptor 832,34809
+(defun hypb:straight-package-plist 846,35410
+(defun hypb:string-count-matches 856,35934
+(defun hypb:supercite-p 884,36942
+(defun hypb:toggle-isearch-invisible 898,37393
+(defun hypb:uuid 918,38317
+(defun hypb:user-name 942,38906
+(defun hypb:window-list 948,39131
+(defvar hypb:home-page 959,39703
+(defvar hypb:hyperbole-banner-keymap962,39807
+(defun hypb:display-file-with-logo 971,40123
+(defun hypb:browse-home-page 993,41119
+(defun hypb:insert-hyperbole-banner 1003,41444
+(defun hypb:locate-pathnames 1034,42862
+(defun hypb:oct-to-int 1042,43167
+(define-button-type 'hyperbole-banner)hyperbole-banner1059,43748
hyperbole.el,821
(defconst hyperbole-loading 81,3564
@@ -2084,15 +2084,15 @@ kotl/klink.el,470
(defun klink:absolute 90,3085
(defun klink:create 105,3832
(defun klink:at-p 145,5569
-(defun klink:set-yank-handler 209,8350
-(defib klink 224,8943
-(defact link-to-kotl 234,9283
-(defun klink:act 270,10704
-(defun klink:parse 279,11040
-(defun klink:replace-label 310,12150
-(defun klink:update-label 324,12632
-(defun klink:yank-handler 337,13186
-(defvar klink:cell-ref-regexp356,14006
+(defun klink:set-yank-handler 210,8442
+(defib klink 225,9035
+(defact link-to-kotl 235,9375
+(defun klink:act 271,10796
+(defun klink:parse 280,11132
+(defun klink:replace-label 311,12242
+(defun klink:update-label 325,12724
+(defun klink:yank-handler 338,13278
+(defvar klink:cell-ref-regexp357,14098
kotl/kmenu.el,236
(defconst kotl-menu-common-body28,853
@@ -2102,7 +2102,7 @@ kotl/kmenu.el,236
(defun kotl-menubar-menu 179,7646
(defun kotl-popup-menu 188,8046
-kotl/kotl-mode.el,9250
+kotl/kotl-mode.el,9397
(defvar kotl-mode-map 37,1230
(defvar kotl-previous-mode 40,1320
(defcustom kotl-mode:shrink-region-flag 43,1424
@@ -2112,193 +2112,198 @@ kotl/kotl-mode.el,9250
(defvar yank-window-start 76,2909
(defvar yank-undo-function 77,2940
(defun kotl-mode 93,3588
-(defun kotl-mode:example 215,8769
-(defalias
'kotl-mode:backward-delete-char-untabifykotl-mode:backward-delete-char-untabify271,11185
-(defalias
'kotl-mode:backward-delete-charkotl-mode:backward-delete-char273,11271
-(defalias
'kotl-mode:delete-forward-charkotl-mode:delete-forward-char275,11348
-(defalias 'kotl-mode:left-char kotl-mode:left-char277,11415
-(defalias 'kotl-mode:right-char kotl-mode:right-char278,11472
-(defun kotl-mode:backward-kill-word 280,11530
-(defun kotl-mode:backward-or-forward-delete-char 296,12050
-(defun kotl-mode:center-line 304,12465
-(defun kotl-mode:center-paragraph 327,13313
-(defun kotl-mode:copy-kcell-reference-to-register 349,14112
-(defun kotl-mode:copy-absolute-kcell-link-to-kill-ring 364,14766
-(defun kotl-mode:copy-relative-kcell-link-to-kill-ring 371,15049
-(defun kotl-mode:copy-absolute-kcell-link-to-register 377,15286
-(defun kotl-mode:copy-relative-kcell-link-to-register 384,15616
-(defun kotl-mode:copy-region-as-kill 391,15936
-(defun kotl-mode:copy-to-register 396,16119
-(defun kotl-mode:delete-backward-char 409,16583
-(defun kotl-mode:delete-blank-lines 423,17100
-(defun kotl-mode:delete-char 446,17966
-(defun kotl-mode:delete-horizontal-space 510,20210
-(defun kotl-mode:delete-indentation 521,20510
-(defun kotl-mode:skip-filling-p 546,21402
-(defun kotl-mode:fill-cell 561,21883
-(defun kotl-mode:fill-paragraph 617,24163
-(defun kotl-mode:fill-tree 650,25567
-(defun kotl-mode:just-one-space 658,25967
-(defun kotl-mode:kill-line 667,26254
-(defalias 'kotl-mode:kill-visual-line kotl-mode:kill-visual-line700,27379
-(defun kotl-mode:kill-whole-line 702,27440
-(defun kotl-mode:kill-region 708,27603
-(defun kotl-mode:kill-or-copy-region 764,29947
-(defalias 'kotl-mode:completion-kill-region
kotl-mode:completion-kill-region799,31125
-(defalias 'kotl-mode:kill-ring-save kotl-mode:kill-ring-save802,31212
-(defun kotl-mode:kill-sentence 804,31281
-(defun kotl-mode:kill-word 820,31783
-(defun kotl-mode:newline 836,32267
-(defalias 'kotl-mode:electric-indent-just-newline
kotl-mode:electric-indent-just-newline856,32821
-(defalias 'kotl-mode:electric-newline-and-maybe-indent
kotl-mode:electric-newline-and-maybe-indent857,32891
-(defalias 'kotl-mode:newline-and-indent kotl-mode:newline-and-indent858,32966
-(defalias 'kotl-mode:reindent-then-newline-and-indent
kotl-mode:reindent-then-newline-and-indent859,33026
-(defun kotl-mode:open-line 861,33101
-(defun kotl-mode:quoted-insert 880,33686
-(defun kotl-mode:set-fill-prefix 919,35299
-(defun kotl-mode:tab-command 925,35526
-(defun kotl-mode:toggle-indent-tabs-mode 940,36145
-(defun kotl-mode:toggle-tab-flag 949,36552
-(defun kotl-mode:transpose-chars 960,37091
-(defun kotl-mode:transpose-lines 973,37780
-(defun kotl-mode:transpose-paragraphs 1022,39691
-(defun kotl-mode:transpose-sentences 1027,39893
-(defun kotl-mode:transpose-words 1032,40084
-(defun kotl-mode:untab-command 1040,40495
-(defun kotl-mode:zap-to-char 1057,41194
-(defun kotl-mode:append-cell 1068,41656
-(defun kotl-mode:clipboard-yank 1093,42701
-(defun kotl-mode:copy-after 1099,42888
-(defun kotl-mode:copy-before 1124,43859
-(defun kotl-mode:move-after 1149,44885
-(defun kotl-mode:move-before 1246,48841
-(defun kotl-mode:yank 1340,52778
-(defun kotl-mode:yank-pop 1375,54273
-(defalias 'kotl-mode:scroll-down-command
kotl-mode:scroll-down-command1421,56196
-(defalias 'kotl-mode:scroll-up-command kotl-mode:scroll-up-command1422,56261
-(defun kotl-mode:back-to-indentation 1424,56324
-(defun kotl-mode:backward-cell 1431,56559
-(defun kotl-mode:backward-char 1452,57349
-(defun kotl-mode:backward-paragraph 1473,57987
-(defalias 'kotl-mode:backward-para kotl-mode:backward-para1487,58469
-(defun kotl-mode:backward-sentence 1489,58536
-(defun kotl-mode:backward-word 1518,59571
-(defun kotl-mode:beginning-of-buffer 1537,60089
-(defun kotl-mode:beginning-of-cell 1548,60443
-(defun kotl-mode:beginning-of-line 1561,60898
-(defalias 'kotl-mode:beginning-of-visual-line
kotl-mode:beginning-of-visual-line1576,61462
-(defalias 'kotl-mode:move-beginning-of-line
kotl-mode:move-beginning-of-line1577,61538
-(defun kotl-mode:beginning-of-tree 1579,61613
-(defun kotl-mode:down-level 1592,62155
-(defun kotl-mode:end-of-buffer 1612,62793
-(defun kotl-mode:end-of-cell 1624,63158
-(defun kotl-mode:to-end-of-line 1640,63821
-(defalias 'kotl-mode:end-of-line kotl-mode:end-of-line1655,64390
-(defalias 'kotl-mode:end-of-visual-line
kotl-mode:end-of-visual-line1656,64450
-(defalias 'kotl-mode:move-end-of-line kotl-mode:move-end-of-line1657,64517
-(defun kotl-mode:end-of-tree 1659,64583
-(defun kotl-mode:first-sibling 1682,65573
-(defun kotl-mode:forward-cell 1694,66105
-(defun kotl-mode:forward-char 1709,66693
-(defun kotl-mode:forward-paragraph 1729,67291
-(defalias 'kotl-mode:forward-para kotl-mode:forward-para1752,68114
-(defun kotl-mode:forward-sentence 1754,68179
-(defun kotl-mode:forward-word 1782,69151
-(defun kotl-mode:goto-cell 1805,69900
-(defun kotl-mode:head-cell 1845,71522
-(defun kotl-mode:last-sibling 1856,71896
-(defun kotl-mode:mark-paragraph 1868,72428
-(defun kotl-mode:mark-whole-buffer 1878,72747
-(defun kotl-mode:next-cell 1886,73000
-(defun kotl-mode:next-line 1900,73465
-(defun kotl-mode:next-tree 1925,74347
-(defun kotl-mode:previous-line 1937,74861
-(defun kotl-mode:previous-cell 1961,75724
-(defun kotl-mode:scroll-down 1982,76420
-(defun kotl-mode:scroll-up 1991,76737
-(defun kotl-mode:tail-cell 2000,77044
-(defun kotl-mode:up-level 2012,77437
-(defun kotl-mode:bobp 2038,78389
-(defun kotl-mode:bocp 2045,78609
-(defun kotl-mode:bolp 2058,79043
-(defun kotl-mode:buffer-empty-p 2063,79192
-(defun kotl-mode:eobp 2069,79379
-(defun kotl-mode:eocp 2074,79537
-(defun kotl-mode:eolp 2085,79848
-(defun kotl-mode:first-cell-p 2096,80263
-(defalias 'kotl-mode:first-line-p kotl-mode:first-line-p2100,80405
-(defun kotl-mode:last-cell-p 2102,80455
-(defun kotl-mode:last-line-p 2106,80591
-(defun kotl-mode:action-key 2117,80938
-(defun kotl-mode:assist-key 2159,82834
-(defun kotl-mode:add-child 2200,84719
-(defun kotl-mode:add-parent 2205,84867
-(defun kotl-mode:add-cell 2210,85019
-(defun kotl-mode:demote-tree 2293,88233
-(defun kotl-mode:exchange-cells 2355,90413
-(defun kotl-mode:kill-contents 2433,93258
-(defun kotl-mode:kill-tree 2441,93506
-(defun kotl-mode:move-tree-backward 2469,94518
-(defun kotl-mode:move-tree-forward 2478,94882
-(defun kotl-mode:promote-tree 2502,95840
-(defun kotl-mode:remove-cell-attribute 2546,97344
-(defun kotl-mode:set-cell-attribute 2591,99018
-(defun kotl-mode:set-or-remove-cell-attribute 2649,101285
-(defun kotl-mode:split-cell 2671,102298
-(defun kotl-mode:transpose-cells 2702,103497
-(defun kotl-mode:copy-region-to-buffer 2756,105593
-(defun kotl-mode:copy-tree-to-buffer 2779,106584
-(defun kotl-mode:copy-tree-or-region-to-buffer 2809,107922
-(defun kotl-mode:mail-tree 2822,108425
-(defun kotl-mode:collapse-tree 2849,109367
-(defun kotl-mode:expand-tree 2861,109850
-(defun kotl-mode:toggle-tree-expansion 2875,110397
-(defun kotl-mode:overview 2888,110845
-(defun kotl-mode:show-all 2898,111131
-(defun kotl-mode:top-cells 2912,111621
-(defun kotl-mode:hide-sublevels 2927,112109
-(defun kotl-mode:hide-subtree 2938,112619
-(defun kotl-mode:show-subtree 2955,113251
-(defun kotl-mode:hide-tree 2961,113456
-(defun kotl-mode:show-tree 2981,114183
-(defun kotl-mode:cell-attributes 2986,114336
-(defun kotl-mode:cell-help 3001,114913
-(defun kotl-mode:get-cell-attribute 3055,116957
-(defun kotl-mode:org-delete-backward-char 3081,118027
-(defun kotl-mode:org-delete-char 3091,118528
-(defun kotl-mode:org-force-self-insert 3101,119007
-(defun kotl-mode:orgtbl-ctrl-c-ctrl-c 3107,119187
-(defun kotl-mode:orgtbl-create-or-convert-from-region 3115,119465
-(defun kotl-mode:orgtbl-self-insert-command 3123,119818
-(defun kotl-mode:add-indent-to-region 3136,120348
-(defun kotl-mode:delete-line 3148,120852
-(defun kotl-mode:exchange-point-and-mark 3162,121340
-(defun kotl-mode:indent-line 3168,121618
-(defun kotl-mode:indent-region 3182,122108
-(defun kotl-mode:is-p 3187,122236
-(defun kotl-mode:shrink-region 3194,122476
-(defun kotl-mode:valid-region-p 3213,123352
-(defun kotl-mode:maybe-shrink-region-p 3223,123746
-(defun kotl-mode:tree-end 3248,124732
-(defun kotl-mode:tree-start 3267,125479
-(defun kotl-mode:line-move 3272,125668
-(defun kotl-mode:pre-self-insert-command 3291,126341
-(defun kotl-mode:print-attributes 3303,126943
-(defun kotl-mode:isearch-open-invisible 3322,127692
-(defun kotl-mode:reveal-toggle-invisible 3325,127836
-(defun kotl-mode:set-temp-goal-column 3366,129541
-(defun kotl-mode:to-visible-position 3377,129943
-(defun kotl-mode:to-valid-position 3390,130524
-(defun kotl-mode:transpose-lines-internal 3407,131226
-(defun kotl-mode:update-buffer 3430,132001
-(defun kotl-mode:maintain-region-highlight 3441,132324
-(defun delete-selection-pre-hook 3662,141895
-
-kotl/kotl-orgtbl.el,154
-(defun orgtbl-tab 61,2619
-(defun kotl-mode:transpose-lines-up 72,3024
-(defun kotl-mode:transpose-lines-down 82,3348
-(defun orgtbl-meta-return 87,3430
+(defun kotl-mode:example 214,8413
+(defalias
'kotl-mode:backward-delete-char-untabifykotl-mode:backward-delete-char-untabify270,10829
+(defalias
'kotl-mode:backward-delete-charkotl-mode:backward-delete-char272,10915
+(defalias
'kotl-mode:delete-forward-charkotl-mode:delete-forward-char274,10992
+(defalias 'kotl-mode:left-char kotl-mode:left-char276,11059
+(defalias 'kotl-mode:right-char kotl-mode:right-char277,11116
+(defun kotl-mode:backward-kill-word 279,11174
+(defun kotl-mode:backward-or-forward-delete-char 295,11694
+(defun kotl-mode:center-line 303,12109
+(defun kotl-mode:center-paragraph 326,12957
+(defun kotl-mode:copy-kcell-reference-to-register 348,13756
+(defun kotl-mode:copy-absolute-kcell-link-to-kill-ring 363,14410
+(defun kotl-mode:copy-relative-kcell-link-to-kill-ring 370,14693
+(defun kotl-mode:copy-absolute-kcell-link-to-register 376,14930
+(defun kotl-mode:copy-relative-kcell-link-to-register 383,15260
+(defun kotl-mode:copy-region-as-kill 390,15580
+(defun kotl-mode:copy-to-register 395,15763
+(defun kotl-mode:delete-backward-char 408,16227
+(defun kotl-mode:delete-blank-lines 422,16744
+(defun kotl-mode:delete-char 445,17610
+(defun kotl-mode:delete-horizontal-space 509,19854
+(defun kotl-mode:delete-indentation 520,20154
+(defun kotl-mode:skip-filling-p 545,21046
+(defun kotl-mode:fill-cell 560,21527
+(defun kotl-mode:fill-paragraph 616,23807
+(defun kotl-mode:fill-tree 649,25211
+(defun kotl-mode:just-one-space 657,25611
+(defun kotl-mode:kill-line 666,25898
+(defalias 'kotl-mode:kill-visual-line kotl-mode:kill-visual-line699,27023
+(defun kotl-mode:kill-whole-line 701,27084
+(defun kotl-mode:kill-region 707,27247
+(defun kotl-mode:kill-or-copy-region 763,29591
+(defalias 'kotl-mode:completion-kill-region
kotl-mode:completion-kill-region798,30769
+(defalias 'kotl-mode:kill-ring-save kotl-mode:kill-ring-save801,30856
+(defun kotl-mode:kill-sentence 803,30925
+(defun kotl-mode:kill-word 819,31427
+(defun kotl-mode:newline 835,31911
+(defalias 'kotl-mode:electric-indent-just-newline
kotl-mode:electric-indent-just-newline855,32465
+(defalias 'kotl-mode:electric-newline-and-maybe-indent
kotl-mode:electric-newline-and-maybe-indent856,32535
+(defalias 'kotl-mode:newline-and-indent kotl-mode:newline-and-indent857,32610
+(defalias 'kotl-mode:reindent-then-newline-and-indent
kotl-mode:reindent-then-newline-and-indent858,32670
+(defun kotl-mode:open-line 860,32745
+(defun kotl-mode:quoted-insert 879,33330
+(defun kotl-mode:set-fill-prefix 918,34943
+(defun kotl-mode:tab-command 924,35170
+(defun kotl-mode:toggle-indent-tabs-mode 939,35789
+(defun kotl-mode:toggle-tab-flag 948,36196
+(defun kotl-mode:transpose-chars 959,36735
+(defun kotl-mode:transpose-lines 972,37424
+(defun kotl-mode:transpose-paragraphs 1021,39335
+(defun kotl-mode:transpose-sentences 1026,39537
+(defun kotl-mode:transpose-words 1031,39728
+(defun kotl-mode:untab-command 1039,40139
+(defun kotl-mode:zap-to-char 1056,40838
+(defun kotl-mode:append-cell 1067,41300
+(defun kotl-mode:clipboard-yank 1092,42345
+(defun kotl-mode:copy-after 1098,42532
+(defun kotl-mode:copy-before 1123,43503
+(defun kotl-mode:move-after 1148,44529
+(defun kotl-mode:move-before 1245,48485
+(defun kotl-mode:yank 1339,52422
+(defun kotl-mode:yank-pop 1374,53917
+(defalias 'kotl-mode:scroll-down-command
kotl-mode:scroll-down-command1420,55840
+(defalias 'kotl-mode:scroll-up-command kotl-mode:scroll-up-command1421,55905
+(defun kotl-mode:back-to-indentation 1423,55968
+(defun kotl-mode:backward-cell 1430,56203
+(defun kotl-mode:backward-char 1451,56993
+(defun kotl-mode:backward-paragraph 1473,57666
+(defalias 'kotl-mode:backward-para kotl-mode:backward-para1487,58148
+(defun kotl-mode:backward-sentence 1489,58215
+(defun kotl-mode:backward-word 1518,59250
+(defun kotl-mode:beginning-of-buffer 1537,59768
+(defun kotl-mode:beginning-of-cell 1548,60122
+(defun kotl-mode:beginning-of-line 1561,60577
+(defalias 'kotl-mode:beginning-of-visual-line
kotl-mode:beginning-of-visual-line1576,61141
+(defalias 'kotl-mode:move-beginning-of-line
kotl-mode:move-beginning-of-line1577,61217
+(defun kotl-mode:beginning-of-tree 1579,61292
+(defun kotl-mode:down-level 1592,61834
+(defun kotl-mode:end-of-buffer 1612,62472
+(defun kotl-mode:end-of-cell 1624,62837
+(defun kotl-mode:to-end-of-line 1640,63500
+(defalias 'kotl-mode:end-of-line kotl-mode:end-of-line1655,64069
+(defalias 'kotl-mode:end-of-visual-line
kotl-mode:end-of-visual-line1656,64129
+(defalias 'kotl-mode:move-end-of-line kotl-mode:move-end-of-line1657,64196
+(defun kotl-mode:end-of-tree 1659,64262
+(defun kotl-mode:first-sibling 1682,65252
+(defun kotl-mode:forward-cell 1694,65784
+(defun kotl-mode:forward-char 1709,66372
+(defun kotl-mode:forward-paragraph 1727,66916
+(defalias 'kotl-mode:forward-para kotl-mode:forward-para1750,67739
+(defun kotl-mode:forward-sentence 1752,67804
+(defun kotl-mode:forward-word 1780,68776
+(defun kotl-mode:goto-cell 1803,69525
+(defun kotl-mode:head-cell 1843,71147
+(defun kotl-mode:last-sibling 1854,71521
+(defun kotl-mode:mark-paragraph 1866,72053
+(defun kotl-mode:mark-whole-buffer 1876,72372
+(defun kotl-mode:next-cell 1884,72625
+(defun kotl-mode:next-line 1898,73090
+(defun kotl-mode:next-tree 1923,73972
+(defun kotl-mode:previous-line 1935,74486
+(defun kotl-mode:previous-cell 1959,75349
+(defun kotl-mode:scroll-down 1980,76045
+(defun kotl-mode:scroll-up 1989,76362
+(defun kotl-mode:tail-cell 1998,76669
+(defun kotl-mode:up-level 2010,77062
+(defun kotl-mode:bobp 2036,78014
+(defun kotl-mode:bocp 2043,78234
+(defun kotl-mode:bolp 2056,78668
+(defun kotl-mode:buffer-empty-p 2061,78817
+(defun kotl-mode:eobp 2067,79004
+(defun kotl-mode:eocp 2072,79162
+(defun kotl-mode:eolp 2083,79473
+(defun kotl-mode:first-cell-p 2094,79888
+(defalias 'kotl-mode:first-line-p kotl-mode:first-line-p2098,80030
+(defun kotl-mode:last-cell-p 2100,80080
+(defun kotl-mode:last-line-p 2104,80216
+(defun kotl-mode:action-key 2115,80563
+(defun kotl-mode:assist-key 2157,82459
+(defun kotl-mode:add-child 2198,84344
+(defun kotl-mode:add-parent 2203,84492
+(defun kotl-mode:add-cell 2208,84644
+(defun kotl-mode:demote-tree 2291,87858
+(defun kotl-mode:exchange-cells 2353,90038
+(defun kotl-mode:kill-contents 2431,92883
+(defun kotl-mode:kill-tree 2439,93131
+(defun kotl-mode:move-tree-backward 2467,94143
+(defun kotl-mode:move-tree-forward 2476,94507
+(defun kotl-mode:promote-tree 2500,95465
+(defun kotl-mode:remove-cell-attribute 2544,96969
+(defun kotl-mode:set-cell-attribute 2589,98643
+(defun kotl-mode:set-or-remove-cell-attribute 2647,100910
+(defun kotl-mode:split-cell 2669,101923
+(defun kotl-mode:transpose-cells 2700,103122
+(defun kotl-mode:copy-region-to-buffer 2754,105218
+(defun kotl-mode:copy-tree-to-buffer 2777,106209
+(defun kotl-mode:copy-tree-or-region-to-buffer 2807,107547
+(defun kotl-mode:mail-tree 2820,108050
+(defun kotl-mode:collapse-tree 2847,108992
+(defun kotl-mode:expand-tree 2859,109475
+(defun kotl-mode:toggle-tree-expansion 2873,110022
+(defun kotl-mode:overview 2886,110470
+(defun kotl-mode:show-all 2896,110756
+(defun kotl-mode:top-cells 2910,111246
+(defun kotl-mode:hide-sublevels 2925,111734
+(defun kotl-mode:hide-subtree 2936,112244
+(defun kotl-mode:show-subtree 2953,112876
+(defun kotl-mode:hide-tree 2959,113081
+(defun kotl-mode:show-tree 2979,113808
+(defun kotl-mode:cell-attributes 2984,113961
+(defun kotl-mode:cell-help 2999,114538
+(defun kotl-mode:get-cell-attribute 3053,116582
+(defun kotl-mode:org-delete-backward-char 3080,117684
+(defun kotl-mode:org-delete-char 3090,118185
+(defun kotl-mode:org-force-self-insert 3100,118664
+(defun kotl-mode:org-self-insert-command 3106,118844
+(defun kotl-mode:orgtbl-ctrl-c-ctrl-c 3114,119192
+(defun kotl-mode:orgtbl-create-or-convert-from-region 3122,119470
+(defun kotl-mode:orgtbl-self-insert-command 3130,119823
+(defun kotl-mode:self-insert-command 3139,120176
+(defun kotl-mode:add-indent-to-region 3157,121097
+(defun kotl-mode:delete-line 3169,121603
+(defun kotl-mode:exchange-point-and-mark 3183,122091
+(defun kotl-mode:indent-line 3189,122369
+(defun kotl-mode:indent-region 3203,122859
+(defun kotl-mode:is-p 3208,122987
+(defun kotl-mode:shrink-region 3215,123227
+(defun kotl-mode:valid-region-p 3234,124103
+(defun kotl-mode:maybe-shrink-region-p 3244,124497
+(defun kotl-mode:tree-end 3269,125483
+(defun kotl-mode:tree-start 3288,126230
+(defun kotl-mode:line-move 3293,126419
+(defun kotl-mode:pre-self-insert-command 3312,127092
+(defun kotl-mode:print-attributes 3324,127694
+(defun kotl-mode:isearch-open-invisible 3343,128443
+(defun kotl-mode:reveal-toggle-invisible 3346,128587
+(defun kotl-mode:set-temp-goal-column 3387,130292
+(defun kotl-mode:to-visible-position 3398,130694
+(defun kotl-mode:to-valid-position 3411,131275
+(defun kotl-mode:transpose-lines-internal 3428,131977
+(defun kotl-mode:update-buffer 3451,132752
+(defun kotl-mode:maintain-region-highlight 3462,133075
+(defun kotl-mode:setup-keymap 3467,133232
+(defun delete-selection-pre-hook 3680,142578
+
+kotl/kotl-orgtbl.el,275
+(defvar kotl-mode-overriding-orgtbl-mode-map 60,2554
+(defun orgtbl-tab 68,2924
+(defun kotl-mode:transpose-lines-up 79,3329
+(defun kotl-mode:transpose-lines-down 89,3653
+(defun kotl-mode:orgtbl-meta-return 94,3735
+(defun kotl-mode:setup-overriding-orgtbl-keymap 99,3866
kotl/kcell.el,692
(defvar kcell:read-only-attributes40,1519
@@ -2711,8 +2716,9 @@ test/hui-tests.el,2719
(ert-deftest hui--ebut-rename-numbered-label 676,26253
(ert-deftest hui--ebut-rename-all-copies 689,26799
-test/hypb-tests.el,49
-(ert-deftest hypb:installation-type-test 26,561
+test/hypb-tests.el,88
+(ert-deftest hypb:installation-type-test 26,562
+(ert-deftest hypb--oct-to-int 68,2703
test/hyperbole-tests.el,197
(defun hyperbole-key-bindings 28,734
diff --git a/hversion.el b/hversion.el
index 5ae7979204..45f4390bd6 100644
--- a/hversion.el
+++ b/hversion.el
@@ -4,7 +4,7 @@
;; Maintainer: Bob Weiner, Mats Lidell
;;
;; Orig-Date: 1-Jan-94
-;; Last-Mod: 23-May-23 at 00:06:52 by Bob Weiner
+;; Last-Mod: 27-May-23 at 12:17:40 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -112,7 +112,7 @@ the pathname."
file))
file (substitute-in-file-name file)
file (locate-file file load-path
- (when (null nosuffix) '(".eln" ".elc" ".el"
".el.gz" ".el.Z"))
+ (when (null nosuffix) '(".elc" ".el" ".el.gz"
".el.Z"))
;; accept any existing file
nil)
file (if (and (stringp file)
diff --git a/kotl/kotl-mode.el b/kotl/kotl-mode.el
index f9e49f5b64..89cd6d46f4 100644
--- a/kotl/kotl-mode.el
+++ b/kotl/kotl-mode.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 6/30/93
-;; Last-Mod: 21-May-23 at 14:37:14 by Bob Weiner
+;; Last-Mod: 27-May-23 at 23:53:04 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -95,6 +95,28 @@ Normally set from the UNDO element of a yank-handler; see
It provides the following keys:
\\{kotl-mode-map}"
(interactive)
+ (mapc #'make-local-variable
+ '(hyrolo-entry-regexp
+ indent-line-function
+ indent-region-function
+ kotl-previous-mode
+ line-move-ignore-invisible
+ minor-mode-alist
+ minor-mode-overriding-map-alist
+ outline-isearch-open-invisible-function
+ outline-level
+ outline-regexp
+ paragraph-separate
+ paragraph-start
+ selective-display-ellipses))
+ ;; Enable Org Table editing minor mode so that necessary key binding
+ ;; overrides are made. If not desired, the user can disable it via
+ ;; `kotl-mode-hook'.
+ (orgtbl-mode 1)
+ (unless kotl-mode-map
+ (kotl-mode:setup-keymap))
+ (unless kotl-mode-overriding-orgtbl-mode-map
+ (kotl-mode:setup-overriding-orgtbl-keymap))
(use-local-map kotl-mode-map)
(set-syntax-table text-mode-syntax-table)
;; Turn off filladapt minor mode if on, so that it does not interfere with
@@ -114,26 +136,20 @@ It provides the following keys:
;; Ensure that outline structure data is saved when save-buffer is called
;; from save-some-buffers, {C-x s}.
(add-hook 'write-file-functions #'kotl-mode:update-buffer nil 'local)
- (mapc #'make-local-variable
- '(hyrolo-entry-regexp kotl-previous-mode
- indent-line-function indent-region-function
- outline-isearch-open-invisible-function
- outline-level outline-regexp
- line-move-ignore-invisible minor-mode-alist
- selective-display-ellipses
- paragraph-separate paragraph-start))
;; Used by kimport.el functions.
(unless (and (boundp 'kotl-previous-mode) kotl-previous-mode)
(setq hyrolo-entry-regexp (concat "^" kview:outline-regexp)
kotl-previous-mode major-mode
+ ;; Override orgtbl-mode keys with kotl-mode-specific ones.
+ minor-mode-overriding-map-alist (list (cons 'orgtbl-mode
+
kotl-mode-overriding-orgtbl-mode-map))
;; Remove outline minor-mode mode-line indication.
- minor-mode-alist (copy-sequence minor-mode-alist)
minor-mode-alist (set:remove '(outline-minor-mode " Outl")
- minor-mode-alist)
+ minor-mode-alist)
minor-mode-alist (set:remove '(selective-display " Outline")
- minor-mode-alist)
+ minor-mode-alist)
minor-mode-alist (set:remove '(selective-display " Otl")
- minor-mode-alist)
+ minor-mode-alist)
;; Remove indication that buffer is narrowed.
mode-line-format (copy-sequence mode-line-format)
mode-line-format (set:remove "%n" mode-line-format)
@@ -191,23 +207,6 @@ It provides the following keys:
;; koutline.
(hyperb:with-suppressed-warnings ((free-vars kotl-previous-mode))
(setq kotl-previous-mode 'kotl-mode))
- ;; Enable Org Table editing minor mode (user can disable via kotl-mode-hook
- ;; if desired).
- (orgtbl-mode 1)
- ;; Override org-tbl {M-RET} binding since Action Key provides the
- ;; same funcitonality when in a table, but may also be invoked from
- ;; a mouse button.
- (org-defkey orgtbl-mode-map "\M-\C-m"
- (orgtbl-make-binding 'orgtbl-meta-return 105
- "\M-\C-m" [(meta return)]))
- (org-defkey orgtbl-mode-map [(meta return)]
- (orgtbl-make-binding 'orgtbl-meta-return 106
- [(meta return)] "\M-\C-m"))
- (org-defkey orgtbl-mode-map "\C-d"
- (orgtbl-make-binding 'kotl-mode:delete-char 201 "\C-d"))
- (org-defkey orgtbl-mode-map [S-iso-lefttab]
- (orgtbl-make-binding 'org-shifttab 107
- [S-iso-lefttab] [backtab] [(shift tab)]))
(run-hooks 'kotl-mode-hook)
(add-hook 'change-major-mode-hook #'kotl-mode:show-all nil t))
@@ -1465,7 +1464,8 @@ Return number of cells left to move."
((kotl-mode:bolp)
(when (re-search-backward "[\n\r]" nil t)
(kotl-mode:to-valid-position t)))
- (t (backward-char)))
+ (t (backward-char)
+ (kotl-mode:to-valid-position t)))
(setq arg (1- arg)))
(kotl-mode:forward-char (- arg)))
(point))
@@ -1718,10 +1718,8 @@ Return number of cells left to move."
(error "(kotl-mode:forward-char): End of buffer"))
((kotl-mode:eocp)
(kcell-view:next t))
- ((kotl-mode:eolp)
- (forward-char)
- (kotl-mode:to-visible-position))
- (t (forward-char)))
+ (t (forward-char)
+ (kotl-mode:to-valid-position)))
(setq arg (1- arg)))
(kotl-mode:backward-char (- arg)))
(point))
@@ -2075,7 +2073,7 @@ If at tail cell already, do nothing and return nil."
"Return point if in a visible position at the end of a kview cell, else nil."
(when (or (smart-eobp)
(looking-at "[\n\r]+\\'")
- (when (kotl-mode:eolp)
+ (when (kotl-mode:eolp t)
(save-excursion
(skip-chars-forward "\n\r")
(kotl-mode:beginning-of-line)
@@ -3076,6 +3074,7 @@ When called interactively, it displays the value in the
minibuffer."
;;; ------------------------------------------------------------------------
;;; Org mode and Org Table overrides to limit editing to a cell
+;;; (used in "kotl-orgtbl.el").
;;; ------------------------------------------------------------------------
(defun kotl-mode:org-delete-backward-char (n)
@@ -3104,6 +3103,14 @@ because, in this case the deletion might narrow the
column."
(kcell-view:operate
(lambda () (org-force-self-insert n))))
+(defun kotl-mode:org-self-insert-command (n)
+ "Like `self-insert-command’, use overwrite-mode for whitespace in tables.
+If the cursor is in a table looking at whitespace, the whitespace is
+overwritten, and the table is not marked as requiring realignment."
+ (interactive "p")
+ (kcell-view:operate
+ (lambda () (org-self-insert-command n))))
+
(defun kotl-mode:orgtbl-ctrl-c-ctrl-c (arg)
"If the cursor is inside a table, realign the table.
If it is a table to be sent away to a receiver, do it.
@@ -3129,6 +3136,20 @@ overwritten, and the table is not marked as requiring
realignment."
(lambda () (orgtbl-self-insert-command n))))
+(defun kotl-mode:self-insert-command (n &optional c)
+ "Insert the character you type.
+Whichever character C you type to run this command is inserted.
+The numeric prefix argument N says how many times to repeat the insertion.
+Before insertion, `expand-abbrev’ is executed if the inserted character does
+not have word syntax and the previous character in the buffer does.
+After insertion, `internal-auto-fill’ is called if
+`auto-fill-function’ is non-nil and if the `auto-fill-chars’ table has
+a non-nil value for the inserted character. At the end, it runs
+`post-self-insert-hook’."
+ (interactive (list (prefix-numeric-value current-prefix-arg)
last-command-event))
+ (kcell-view:operate
+ (lambda () (self-insert-command n c))))
+
;;; ************************************************************************
;;; Private functions
;;; ************************************************************************
@@ -3289,16 +3310,19 @@ newlines at end of tree."
;; Consult this: (kotl-mode:to-visible-position)
(defun kotl-mode:pre-self-insert-command ()
- "In a Koutline ensure point is in an editable position before insertion.
+ "In a Koutline, ensure point is in an editable position before insertion.
Mouse may have moved point outside of an editable area.
`kotl-mode' adds this function to `pre-command-hook'."
- (when (and (memq this-command '(self-insert-command
orgtbl-self-insert-command))
- (eq major-mode 'kotl-mode)
- (not (kview:valid-position-p))
- ;; Prevent repeatedly moving point to valid position when moving
trees
- (not (hyperb:stack-frame '(kcell-view:to-label-end))))
- (when (not (kview:valid-position-p))
- (kotl-mode:to-valid-position))))
+ (when (and
+ (memq this-command '(kotl-mode:orgtbl-self-insert-command
+ kotl-mode:self-insert-command
+ orgtbl-self-insert-command
+ self-insert-command))
+ (eq major-mode 'kotl-mode)
+ (not (kview:valid-position-p))
+ ;; Prevent repeatedly moving point to valid position when moving trees
+ (not (hyperb:stack-frame '(kcell-view:to-label-end))))
+ (kotl-mode:to-valid-position)))
(defun kotl-mode:print-attributes (_kview)
"Print to `standard-output' the attributes of the current visible kcell.
@@ -3443,221 +3467,218 @@ Leave point at end of line now residing at START."
;;; ------------------------------------------------------------------------
-(unless kotl-mode-map
- (setq kotl-mode-map
- (cond ((fboundp 'copy-keymap)
- (if (boundp 'indented-text-mode-map)
- (copy-keymap indented-text-mode-map)
- (copy-keymap text-mode-map)))
- (t (make-keymap))))
- ;; Ensure mouse wheel scrolling leaves point in a valid Koutline position
- (when (and (boundp 'mwheel-scroll-up-function)
- (eq (symbol-value 'mwheel-scroll-up-function) 'scroll-up))
- (setq mwheel-scroll-up-function 'kotl-mode:scroll-up
- mwheel-scroll-down-function 'kotl-mode:scroll-down))
- ;; Overload edit keys to deal with structure and labels.
- (let (local-cmd)
- (mapc
- (lambda (cmd)
- (setq local-cmd (intern-soft
- (concat "kotl-mode:" (symbol-name cmd))))
- ;; Only bind key locally if kotl-mode local-cmd has already
- ;; been defined and cmd is a valid function.
- (when (and local-cmd (fboundp cmd))
- ;; Make local-cmd have the same property list as cmd,
- ;; e.g. so pending-delete property is the same, but delete
- ;; interactive-only property to suppress byte-compiler warnings.
- (setplist local-cmd (copy-sequence (symbol-plist cmd)))
- (cl-remprop local-cmd 'interactive-only)
- (substitute-key-definition
- cmd local-cmd kotl-mode-map global-map)))
- '(
- back-to-indentation
- backward-char
- backward-delete-char
- backward-delete-char-untabify
- backward-kill-word
- backward-or-forward-delete-char
- backward-para
- backward-paragraph
- backward-sentence
- backward-word
- beginning-of-buffer
- beginning-of-line
- beginning-of-visual-line
- completion-kill-region
- copy-region-as-kill
- copy-to-register
- delete-blank-lines
- delete-backward-char
- delete-char
- delete-forward-char
- delete-horizontal-space
- delete-indentation
- end-of-buffer
- end-of-line
- end-of-visual-line
- fill-paragraph
- fill-paragraph-or-region
- ;; cursor keys
- fkey-backward-char
- fkey-forward-char
- fkey-next-line
- fkey-previous-line
- backward-char-command
- forward-char-command
- ;;
- forward-char
- forward-word
- forward-para
- forward-paragraph
- forward-sentence
- just-one-space
- kill-word
- kill-line
- kill-visual-line
- kill-whole-line
- kill-region
- kill-ring-save
- kill-sentence
- left-char
- mark-paragraph
- mark-whole-buffer
- move-beginning-of-line
- move-end-of-line
- newline
- newline-and-indent
- next-line
- open-line
- previous-line
- right-char
- scroll-down
- scroll-up
- scroll-down-command
- scroll-up-command
- set-fill-prefix
- transpose-chars
- transpose-lines
- transpose-paragraphs
- transpose-sentences
- transpose-words
- yank
- yank-pop
- zap-to-char
- ;;
- org-delete-backward-char
- org-delete-char
- org-force-self-insert
- orgtbl-ctrl-c-ctrl-c
- orgtbl-create-or-convert-from-region
- orgtbl-self-insert-command)))
-
-
- ;; kotl-mode keys
- (define-key kotl-mode-map "\C-c\C-@" 'kotl-mode:mail-tree)
- (define-key kotl-mode-map "\C-c+" 'kotl-mode:append-cell)
- (define-key kotl-mode-map "\C-c," 'kotl-mode:beginning-of-cell)
- (define-key kotl-mode-map "\C-c." 'kotl-mode:end-of-cell)
- (define-key kotl-mode-map "\C-c<" 'kotl-mode:first-sibling)
- (define-key kotl-mode-map "\C-c>" 'kotl-mode:last-sibling)
- (define-key kotl-mode-map "\C-c^" 'kotl-mode:beginning-of-tree)
- (define-key kotl-mode-map "\C-c$" 'kotl-mode:end-of-tree)
- (define-key kotl-mode-map "\C-ca" 'kotl-mode:add-child)
- (define-key kotl-mode-map "\C-c\C-a" 'kotl-mode:show-all)
- (define-key kotl-mode-map "\C-cb" 'kvspec:toggle-blank-lines)
- (define-key kotl-mode-map "\C-c\C-b" 'kotl-mode:backward-cell)
- (define-key kotl-mode-map "\C-cc" 'kotl-mode:copy-after)
- (define-key kotl-mode-map "\C-c\C-c" 'kotl-mode:copy-before)
- (define-key kotl-mode-map "\C-c\M-c"
'kotl-mode:copy-tree-or-region-to-buffer)
- (define-key kotl-mode-map "\C-cd" 'kotl-mode:down-level)
- (define-key kotl-mode-map "\C-c\C-d" 'kotl-mode:down-level)
- (define-key kotl-mode-map "\C-ce" 'kotl-mode:exchange-cells)
- (define-key kotl-mode-map "\C-c\C-f" 'kotl-mode:forward-cell)
- (define-key kotl-mode-map "\C-cg" 'kotl-mode:goto-cell)
- (define-key kotl-mode-map "\C-ch" 'kotl-mode:cell-help)
- (define-key kotl-mode-map "\C-c\C-h" 'kotl-mode:hide-tree)
- ;; Since the next key binds M-BS, it may already have a local binding,
- ;; in which case we don't want to bind it here.
- (unless (lookup-key kotl-mode-map "\M-\C-h")
- (define-key kotl-mode-map "\M-\C-h" 'kotl-mode:hide-subtree))
- ;; Override this global binding for set-selective-display with a similar
- ;; function appropriate for kotl-mode.
- (define-key kotl-mode-map "\C-x$" 'kotl-mode:hide-sublevels)
- (define-key kotl-mode-map [(tab)] 'kotl-mode:tab-command) ;; TAB
- (define-key kotl-mode-map "\C-i" 'kotl-mode:tab-command) ;; TAB
- (define-key kotl-mode-map [(shift tab)] 'kotl-mode:untab-command) ;;
Shift-TAB
- (define-key kotl-mode-map [S-iso-lefttab] 'kotl-mode:untab-command) ;;
Shift-TAB
- (define-key kotl-mode-map [backtab] 'kotl-mode:untab-command) ;; Shift-TAB
- (define-key kotl-mode-map [(meta tab)] 'kotl-mode:untab-command) ;; M-TAB
- (define-key kotl-mode-map "\M-\C-i" 'kotl-mode:untab-command) ;; M-TAB
- (define-key kotl-mode-map "\C-c\C-i"
'kotl-mode:set-or-remove-cell-attribute)
- (define-key kotl-mode-map "\C-j" 'kotl-mode:add-cell)
- (define-key kotl-mode-map "\M-j" 'kotl-mode:fill-paragraph)
- (define-key kotl-mode-map "\C-c\M-j" 'kotl-mode:fill-cell)
- (define-key kotl-mode-map "\M-\C-j" 'kotl-mode:fill-tree)
- (define-key kotl-mode-map "\C-c\C-k" 'kotl-mode:kill-tree)
- (define-key kotl-mode-map "\C-ck" 'kotl-mode:kill-contents)
- ;; Force an override of the global {C-x i} insert-file binding
- (define-key kotl-mode-map "\C-xi" 'kimport:insert-file)
- ;; Force an override of the global {C-x r i} insert-register binding
- (define-key kotl-mode-map "\C-xri" 'kimport:insert-register)
- (define-key kotl-mode-map "\C-ck" 'kotl-mode:kill-contents)
- (define-key kotl-mode-map "\C-cl" 'klink:create)
- (define-key kotl-mode-map "\C-c\C-l" 'kview:set-label-type)
- (define-key kotl-mode-map "\C-c\M-l" 'kview:set-label-separator)
- (define-key kotl-mode-map "\C-m" 'kotl-mode:newline)
- (define-key kotl-mode-map "\C-cm" 'kotl-mode:move-after)
- (define-key kotl-mode-map "\C-c\C-m" 'kotl-mode:move-before)
- (define-key kotl-mode-map "\C-c\C-n" 'kotl-mode:next-cell)
- (define-key kotl-mode-map "\C-c\C-o" 'kotl-mode:overview)
- (define-key kotl-mode-map "\C-c\C-p" 'kotl-mode:previous-cell)
- (define-key kotl-mode-map "\C-cp" 'kotl-mode:add-parent)
- (if (memq (global-key-binding "\M-q") '(fill-paragraph
- fill-paragraph-or-region))
+(defun kotl-mode:setup-keymap ()
+ (condition-case err
(progn
- (define-key kotl-mode-map "\C-c\M-q" 'kotl-mode:fill-cell)
- (define-key kotl-mode-map "\M-\C-q" 'kotl-mode:fill-tree)))
- (define-key kotl-mode-map "\C-cs" 'kotl-mode:split-cell)
- (define-key kotl-mode-map "\C-c\C-s" 'kotl-mode:show-tree)
- (define-key kotl-mode-map "\C-c\C-\\" 'kotl-mode:show-tree)
- (define-key kotl-mode-map "\M-s" 'kotl-mode:center-line)
- (define-key kotl-mode-map "\M-S" 'kotl-mode:center-paragraph)
- (define-key kotl-mode-map "\C-ct" 'kotl-mode:transpose-cells)
- (define-key kotl-mode-map "\C-c\C-t" 'kotl-mode:top-cells)
- (define-key kotl-mode-map "\C-cu" 'kotl-mode:up-level)
- (define-key kotl-mode-map "\C-c\C-u" 'kotl-mode:up-level)
- (define-key kotl-mode-map "\C-c\C-v" 'kvspec:activate)
- (define-key kotl-mode-map "\C-x\C-w" 'kfile:write)
- (define-key kotl-mode-map [M-up] 'kotl-mode:move-tree-backward)
- (define-key kotl-mode-map (kbd "ESC <up>") 'kotl-mode:move-tree-backward)
- (define-key kotl-mode-map [M-down] 'kotl-mode:move-tree-forward)
- (define-key kotl-mode-map (kbd "ESC <down>") 'kotl-mode:move-tree-forward)
- (mapc (lambda (key)
- (define-key kotl-mode-map key 'kotl-mode:promote-tree))
- (list (kbd "M-<left>") (kbd "M-S-<left>") (kbd "ESC <left>")
- (kbd "ESC S-<left>") (kbd "C-c C-<") (kbd "C-c C-,")))
- (mapc (lambda (key)
- (define-key kotl-mode-map key 'kotl-mode:demote-tree))
- (list (kbd "M-<right>") (kbd "M-S-<right>") (kbd "ESC <right>")
- (kbd "ESC S-<right>") (kbd "C-c C->") (kbd "C-c C-."))))
-
-;; When delete-selection-mode (pending-delete-mode) is enabled, make
-;; these commands delete the region.
-(put 'kotl-mode:quoted-insert 'delete-selection t)
-
-(put 'kotl-mode:yank 'delete-selection 'yank)
-(put 'kotl-mode:clipboard-yank 'delete-selection 'yank)
-(put 'kimport:insert-register 'delete-selection t)
-
-(put 'kotl-mode:delete-backward-char 'delete-selection 'supersede)
-(put 'kotl-mode:delete-forward-char 'delete-selection 'supersede)
-(put 'kotl-mode:delete-char 'delete-selection 'supersede)
-
-(put 'kotl-mode:reindent-then-newline-and-indent 'delete-selection t)
-(put 'kotl-mode:newline-and-indent 'delete-selection t)
-(put 'kotl-mode:newline 'delete-selection t)
-(put 'kotl-mode:electric-newline-and-maybe-indent 'delete-selection t)
-(put 'kotl-mode:open-line 'delete-selection t)
+ (setq kotl-mode-map
+ (cond ((fboundp 'copy-keymap)
+ (if (boundp 'indented-text-mode-map)
+ (copy-keymap indented-text-mode-map)
+ (copy-keymap text-mode-map)))
+ (t (make-keymap))))
+ ;; Ensure mouse wheel scrolling leaves point in a valid Koutline
position
+ (when (and (boundp 'mwheel-scroll-up-function)
+ (eq (symbol-value 'mwheel-scroll-up-function) 'scroll-up))
+ (setq mwheel-scroll-up-function 'kotl-mode:scroll-up
+ mwheel-scroll-down-function 'kotl-mode:scroll-down))
+ ;; Overload edit keys to deal with structure and labels.
+ (let (local-cmd)
+ (mapc
+ (lambda (cmd)
+ (setq local-cmd (intern-soft
+ (concat "kotl-mode:" (symbol-name cmd))))
+ ;; Only bind key locally if kotl-mode local-cmd has already
+ ;; been defined and cmd is a valid function.
+ (when (and local-cmd (fboundp cmd))
+ ;; Make local-cmd have the same property list as cmd,
+ ;; e.g. so pending-delete property is the same, but delete
+ ;; interactive-only property to suppress byte-compiler warnings.
+ (setplist local-cmd (copy-sequence (symbol-plist cmd)))
+ (cl-remprop local-cmd 'interactive-only)
+ ;; `(define-key ,kotl-mode-map [remap ,cmd] ',local-cmd)
+ (substitute-key-definition cmd local-cmd kotl-mode-map
global-map)))
+ '(
+ back-to-indentation
+ backward-char
+ backward-delete-char
+ backward-delete-char-untabify
+ backward-kill-word
+ backward-or-forward-delete-char
+ backward-para
+ backward-paragraph
+ backward-sentence
+ backward-word
+ beginning-of-buffer
+ beginning-of-line
+ beginning-of-visual-line
+ completion-kill-region
+ copy-region-as-kill
+ copy-to-register
+ delete-blank-lines
+ delete-backward-char
+ delete-char
+ delete-forward-char
+ delete-horizontal-space
+ delete-indentation
+ end-of-buffer
+ end-of-line
+ end-of-visual-line
+ fill-paragraph
+ fill-paragraph-or-region
+ ;; cursor keys
+ fkey-backward-char
+ fkey-forward-char
+ fkey-next-line
+ fkey-previous-line
+ backward-char-command
+ forward-char-command
+ ;;
+ forward-char
+ forward-word
+ forward-para
+ forward-paragraph
+ forward-sentence
+ just-one-space
+ kill-word
+ kill-line
+ kill-visual-line
+ kill-whole-line
+ kill-region
+ kill-ring-save
+ kill-sentence
+ left-char
+ mark-paragraph
+ mark-whole-buffer
+ move-beginning-of-line
+ move-end-of-line
+ newline
+ newline-and-indent
+ next-line
+ open-line
+ previous-line
+ right-char
+ scroll-down
+ scroll-up
+ scroll-down-command
+ scroll-up-command
+ set-fill-prefix
+ transpose-chars
+ transpose-lines
+ transpose-paragraphs
+ transpose-sentences
+ transpose-words
+ yank
+ yank-pop
+ zap-to-char)))
+
+ ;; kotl-mode keys
+ (define-key kotl-mode-map "\C-c\C-@" 'kotl-mode:mail-tree)
+ (define-key kotl-mode-map "\C-c+" 'kotl-mode:append-cell)
+ (define-key kotl-mode-map "\C-c," 'kotl-mode:beginning-of-cell)
+ (define-key kotl-mode-map "\C-c." 'kotl-mode:end-of-cell)
+ (define-key kotl-mode-map "\C-c<" 'kotl-mode:first-sibling)
+ (define-key kotl-mode-map "\C-c>" 'kotl-mode:last-sibling)
+ (define-key kotl-mode-map "\C-c^" 'kotl-mode:beginning-of-tree)
+ (define-key kotl-mode-map "\C-c$" 'kotl-mode:end-of-tree)
+ (define-key kotl-mode-map "\C-ca" 'kotl-mode:add-child)
+ (define-key kotl-mode-map "\C-c\C-a" 'kotl-mode:show-all)
+ (define-key kotl-mode-map "\C-cb" 'kvspec:toggle-blank-lines)
+ (define-key kotl-mode-map "\C-c\C-b" 'kotl-mode:backward-cell)
+ (define-key kotl-mode-map "\C-cc" 'kotl-mode:copy-after)
+ (define-key kotl-mode-map "\C-c\C-c" 'kotl-mode:copy-before)
+ (define-key kotl-mode-map "\C-c\M-c"
'kotl-mode:copy-tree-or-region-to-buffer)
+ (define-key kotl-mode-map "\C-cd" 'kotl-mode:down-level)
+ (define-key kotl-mode-map "\C-c\C-d" 'kotl-mode:down-level)
+ (define-key kotl-mode-map "\C-ce" 'kotl-mode:exchange-cells)
+ (define-key kotl-mode-map "\C-c\C-f" 'kotl-mode:forward-cell)
+ (define-key kotl-mode-map "\C-cg" 'kotl-mode:goto-cell)
+ (define-key kotl-mode-map "\C-ch" 'kotl-mode:cell-help)
+ (define-key kotl-mode-map "\C-c\C-h" 'kotl-mode:hide-tree)
+ ;; Since the next key binds M-BS, it may already have a local binding,
+ ;; in which case we don't want to bind it here.
+ (unless (lookup-key kotl-mode-map "\M-\C-h")
+ (define-key kotl-mode-map "\M-\C-h" 'kotl-mode:hide-subtree))
+ ;; Override this global binding for set-selective-display with a similar
+ ;; function appropriate for kotl-mode.
+ (define-key kotl-mode-map "\C-x$" 'kotl-mode:hide-sublevels)
+ (define-key kotl-mode-map [(tab)] 'kotl-mode:tab-command) ;; TAB
+ (define-key kotl-mode-map "\C-i" 'kotl-mode:tab-command) ;; TAB
+ (define-key kotl-mode-map [(shift tab)] 'kotl-mode:untab-command) ;;
Shift-TAB
+ (define-key kotl-mode-map [S-iso-lefttab] 'kotl-mode:untab-command) ;;
Shift-TAB
+ (define-key kotl-mode-map [backtab] 'kotl-mode:untab-command) ;;
Shift-TAB
+ (define-key kotl-mode-map [(meta tab)] 'kotl-mode:untab-command) ;;
M-TAB
+ (define-key kotl-mode-map "\M-\C-i" 'kotl-mode:untab-command) ;; M-TAB
+ (define-key kotl-mode-map "\C-c\C-i"
'kotl-mode:set-or-remove-cell-attribute)
+ (define-key kotl-mode-map "\C-j" 'kotl-mode:add-cell)
+ (define-key kotl-mode-map "\M-j" 'kotl-mode:fill-paragraph)
+ (define-key kotl-mode-map "\C-c\M-j" 'kotl-mode:fill-cell)
+ (define-key kotl-mode-map "\M-\C-j" 'kotl-mode:fill-tree)
+ (define-key kotl-mode-map "\C-c\C-k" 'kotl-mode:kill-tree)
+ (define-key kotl-mode-map "\C-ck" 'kotl-mode:kill-contents)
+ ;; Force an override of the global {C-x i} insert-file binding
+ (define-key kotl-mode-map "\C-xi" 'kimport:insert-file)
+ ;; Force an override of the global {C-x r i} insert-register binding
+ (define-key kotl-mode-map "\C-xri" 'kimport:insert-register)
+ (define-key kotl-mode-map "\C-ck" 'kotl-mode:kill-contents)
+ (define-key kotl-mode-map "\C-cl" 'klink:create)
+ (define-key kotl-mode-map "\C-c\C-l" 'kview:set-label-type)
+ (define-key kotl-mode-map "\C-c\M-l" 'kview:set-label-separator)
+ (define-key kotl-mode-map "\C-m" 'kotl-mode:newline)
+ (define-key kotl-mode-map "\C-cm" 'kotl-mode:move-after)
+ (define-key kotl-mode-map "\C-c\C-m" 'kotl-mode:move-before)
+ (define-key kotl-mode-map "\C-c\C-n" 'kotl-mode:next-cell)
+ (define-key kotl-mode-map "\C-c\C-o" 'kotl-mode:overview)
+ (define-key kotl-mode-map "\C-c\C-p" 'kotl-mode:previous-cell)
+ (define-key kotl-mode-map "\C-cp" 'kotl-mode:add-parent)
+ (if (memq (global-key-binding "\M-q") '(fill-paragraph
+ fill-paragraph-or-region))
+ (progn
+ (define-key kotl-mode-map "\C-c\M-q" 'kotl-mode:fill-cell)
+ (define-key kotl-mode-map "\M-\C-q" 'kotl-mode:fill-tree)))
+ (define-key kotl-mode-map "\C-cs" 'kotl-mode:split-cell)
+ (define-key kotl-mode-map "\C-c\C-s" 'kotl-mode:show-tree)
+ (define-key kotl-mode-map "\C-c\C-\\" 'kotl-mode:show-tree)
+ (define-key kotl-mode-map "\M-s" 'kotl-mode:center-line)
+ (define-key kotl-mode-map "\M-S" 'kotl-mode:center-paragraph)
+ (define-key kotl-mode-map "\C-ct" 'kotl-mode:transpose-cells)
+ (define-key kotl-mode-map "\C-c\C-t" 'kotl-mode:top-cells)
+ (define-key kotl-mode-map "\C-cu" 'kotl-mode:up-level)
+ (define-key kotl-mode-map "\C-c\C-u" 'kotl-mode:up-level)
+ (define-key kotl-mode-map "\C-c\C-v" 'kvspec:activate)
+ (define-key kotl-mode-map "\C-x\C-w" 'kfile:write)
+ (define-key kotl-mode-map [M-up]
'kotl-mode:move-tree-backward)
+ (define-key kotl-mode-map (kbd "ESC <up>")
'kotl-mode:move-tree-backward)
+ (define-key kotl-mode-map [M-down]
'kotl-mode:move-tree-forward)
+ (define-key kotl-mode-map (kbd "ESC <down>")
'kotl-mode:move-tree-forward)
+ (mapc (lambda (key)
+ (define-key kotl-mode-map key 'kotl-mode:promote-tree))
+ (list (kbd "M-<left>") (kbd "M-S-<left>") (kbd "ESC <left>")
+ (kbd "ESC S-<left>") (kbd "C-c C-<") (kbd "C-c C-,")))
+ (mapc (lambda (key)
+ (define-key kotl-mode-map key 'kotl-mode:demote-tree))
+ (list (kbd "M-<right>") (kbd "M-S-<right>") (kbd "ESC <right>")
+ (kbd "ESC S-<right>") (kbd "C-c C->") (kbd "C-c C-.")))
+
+ ;; When delete-selection-mode (pending-delete-mode) is enabled, make
+ ;; these commands delete the region.
+ (put 'kotl-mode:quoted-insert 'delete-selection t)
+
+ (put 'kotl-mode:yank 'delete-selection 'yank)
+ (put 'kotl-mode:clipboard-yank 'delete-selection 'yank)
+ (put 'kimport:insert-register 'delete-selection t)
+
+ (put 'kotl-mode:delete-backward-char 'delete-selection 'supersede)
+ (put 'kotl-mode:delete-forward-char 'delete-selection 'supersede)
+ (put 'kotl-mode:delete-char 'delete-selection 'supersede)
+
+ (put 'kotl-mode:reindent-then-newline-and-indent 'delete-selection t)
+ (put 'kotl-mode:newline-and-indent 'delete-selection t)
+ (put 'kotl-mode:newline 'delete-selection t)
+ (put 'kotl-mode:electric-newline-and-maybe-indent 'delete-selection t)
+ (put 'kotl-mode:open-line 'delete-selection t))
+ (error
+ (setq kotl-mode-map nil)
+ (error "(kotl-mode:setup-keymap): Setup error: %s" err))))
(defun delete-selection-pre-hook ()
"Function run before commands that delete selections are executed.
diff --git a/kotl/kotl-orgtbl.el b/kotl/kotl-orgtbl.el
index 57085619e4..47ab468844 100644
--- a/kotl/kotl-orgtbl.el
+++ b/kotl/kotl-orgtbl.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 10/18/2020
-;; Last-Mod: 24-Jan-22 at 00:25:29 by Bob Weiner
+;; Last-Mod: 27-May-23 at 22:52:47 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -53,6 +53,13 @@
(require 'org-table)
+;;; ************************************************************************
+;;; Public variables
+;;; ************************************************************************
+
+(defvar kotl-mode-overriding-orgtbl-mode-map nil
+ "Keymap to override Org Table minor mode keys within kotl-mode major mode.")
+
;;; ************************************************************************
;;; Public functions
;;; ************************************************************************
@@ -84,12 +91,66 @@ If no previous line, exchange current with next line."
;; !! TODO: Write
)
-(defun orgtbl-meta-return (arg)
- "Let Action Key handle tables in kotl-mode, otherwise, use Org table
command."
+(defun kotl-mode:orgtbl-meta-return (arg)
+ "Let Action Key handle tables in kotl-mode."
(interactive "P")
- (if (derived-mode-p #'kotl-mode)
- (hkey-either arg)
- (org-table-wrap-region arg)))
+ (hkey-either arg))
+
+(defun kotl-mode:setup-overriding-orgtbl-keymap ()
+ (condition-case err
+ (progn
+ (setq kotl-mode-overriding-orgtbl-mode-map
+ (if (fboundp 'copy-keymap)
+ (copy-keymap orgtbl-mode-map)
+ (make-sparse-keymap)))
+
+ ;; Override org-tbl {M-RET} binding since Action Key provides the
+ ;; same functionality when in a table, but may also be invoked from
+ ;; a mouse button.
+ (org-defkey kotl-mode-overriding-orgtbl-mode-map "\M-\C-m"
+ (orgtbl-make-binding 'kotl-mode:orgtbl-meta-return 105
+ "\M-\C-m" [(meta return)]))
+ (org-defkey kotl-mode-overriding-orgtbl-mode-map [(meta return)]
+ (orgtbl-make-binding 'kotl-mode:orgtbl-meta-return 106
+ [(meta return)] "\M-\C-m"))
+ (org-defkey kotl-mode-overriding-orgtbl-mode-map "\C-d"
+ (orgtbl-make-binding 'kotl-mode:delete-char 201 "\C-d"))
+ (org-defkey kotl-mode-overriding-orgtbl-mode-map [S-iso-lefttab]
+ (orgtbl-make-binding 'org-shifttab 107
+ [S-iso-lefttab] [backtab] [(shift
tab)]))
+
+ ;; Overload edit keys to deal with structure and labels.
+ (let ((local-cmd)
+ (cmds '(org-delete-char
+ org-delete-backward-char
+ org-force-self-insert
+ orgtbl-create-or-convert-from-region
+ orgtbl-ctrl-c-ctrl-c
+ orgtbl-self-insert-command)))
+ (mapc
+ (lambda (cmd)
+ (setq local-cmd (intern-soft
+ (concat "kotl-mode:" (symbol-name cmd))))
+ ;; Only bind key locally if kotl-mode local-cmd has already
+ ;; been defined and cmd is a valid function.
+ (when (and local-cmd (fboundp cmd))
+ ;; Make local-cmd have the same property list as cmd,
+ ;; e.g. so pending-delete property is the same, but delete
+ ;; interactive-only property to suppress byte-compiler warnings.
+ (setplist local-cmd (copy-sequence (symbol-plist cmd)))
+ (cl-remprop local-cmd 'interactive-only)
+ (org-remap kotl-mode-overriding-orgtbl-mode-map cmd local-cmd)))
+ (setq cmds
+ (if orgtbl-optimized
+ (nconc '(delete-backward-char
+ delete-char
+ delete-forward-char
+ self-insert-command)
+ cmds)
+ cmds)))))
+ (error
+ (setq kotl-mode-overriding-orgtbl-mode-map nil)
+ (error "(kotl-mode:setup-overriding-orgtbl-keymap): Setup error: %s"
err))))
(provide 'kotl-orgtbl)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/hyperbole 843333ffa8 1/2: Fix Koutliner char movement cmds and override orgtbl bindings,
ELPA Syncer <=