emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/hyperbole 4bad0559d1: Fixes to ibut:operate, ibut:creat


From: ELPA Syncer
Subject: [elpa] externals/hyperbole 4bad0559d1: Fixes to ibut:operate, ibut:create and hbut tests to run on Windows (#380)
Date: Fri, 25 Aug 2023 12:58:09 -0400 (EDT)

branch: externals/hyperbole
commit 4bad0559d120d75b5dde1d5787c35e3dcfffe7aa
Author: Robert Weiner <rsw@gnu.org>
Commit: GitHub <noreply@github.com>

    Fixes to ibut:operate, ibut:create and hbut tests to run on Windows (#380)
    
    * Fix klink:create interactive spec and other byte-compiler warnings
    
    * Fix failing CI test, fast-demo-key-series-help-buffer
    
    * Fixes to ibut:operate, ibut:create and hbut tests to run on Windows
    
    * ibut:operate - Skip past any inserted comment chars
---
 ChangeLog                  |   73 +
 TAGS                       | 3172 ++++++++++++++++++++++----------------------
 hargs.el                   |    5 +-
 hbut.el                    |  301 +++--
 hmouse-drv.el              |    9 +-
 hmouse-tag.el              |    2 +-
 hui.el                     |   52 +-
 hycontrol.el               |    6 +-
 hypb-ert.el                |   13 +-
 hypb.el                    |    4 +-
 kotl/klink.el              |    4 +-
 test/hbut-tests.el         |   81 +-
 test/hib-kbd-tests.el      |    8 +-
 test/hmouse-drv-tests.el   |   39 +-
 test/hpath-tests.el        |    2 +-
 test/hui-register-tests.el |    4 +-
 test/hui-tests.el          |    8 +-
 test/hy-test-helpers.el    |    7 +-
 test/hypb-tests.el         |   16 +-
 test/smart-org-tests.el    |    7 +-
 20 files changed, 1983 insertions(+), 1830 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f0ae8880b..cd9e4e3353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,76 @@
+2023-08-25  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (ibut:operate): Skip past any inserted comment chars prior to
+    ibut at point.
+
+* hbut.el (ibut:operate): Before call 'ibut:at-p', leave point after any 
opening
+    ibut delimiters, since may have just deleted the button name, for example.
+
+* hbut.el (ibut:delete): Also clear in-memory version of the button.
+          (ibut:rename): Clear any in-memory current button attributes so
+    cannot reference any invalid buffer locations after rename.  Also, improve
+    doc string.
+
+* hbut.el (ibut:to): Replace 'ibut:at-p' calls with 'hbut:current since
+    button should have been recoginized and created in-memory before this
+    is called.
+
+2023-08-23  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (ibut:create): Comment out clear of 'hbut:current attributes to 
prevent
+    failure from 'ibut:at-p' calls when using 'ert-deftest'.
+
+2023-08-22  Bob Weiner  <rsw@gnu.org>
+
+* hypb-ert.el (hypb-ert-def-at-p): With optional 'start-end-flag', return list 
of
+    (test-name test-name-start-pos testname-end-pos).
+              (hyperbole-run-test-definition): Use above flag and set name as 
button
+    label to flash in this ibtype.
+
+* hui.el (hui:hbut-operate): Fix so point is temporarily moved to the start of 
the button
+    text before flashing an activating a button.
+
+* test/hmouse-drv-tests.el 
(hbut-pathname-path-variable-with-three-colons-is-a-path-test):
+  test/smart-org-tests.el 
(smart-org-mode-with-smart-keys-buttons-on-hypb-button-activates)
+                          
smart-org-mode-with-smart-keys-on-hypb-button-activates):
+  test/hui-register-tests.el (hui-register-test--register-val-insert-ebut):
+  test/hypb-tests.el (hypb:installation-type-test): Make work under Windows 
where path root
+    is "c:/".
+
+* kotl/klink.el (klink:at-p): Fix to not confuse Windows path drive prefixes 
with URL protocol
+    prefixes.
+
+* hargs.el (hargs:iform-vector): Fix 'D' to read a dir name, not a file name.
+
+* hbut.el (ibut:program): Capture existing ibut name at point in any error.
+
+2023-08-20  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (ibut:operate): Call ibut:insert-text only when hbut:current 'actype
+    attribute is non-nil.
+          (ibut:operate): Remove appending of 'instance-flag' to hbut:current 
'name
+    and replace with 'ibut:at-p' call.
+
+2023-08-13  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (ibut:set-name-and-label-key-p): Save both name-start and name-end 
pos.
+          (ibut:delete-occurrence): Use above button attributes and remove 
'name'
+    argument.
+          (ibut:delete): Fix to delete ibut name and text.
+
+2023-08-10  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (ibut:set-name-and-label-key-p): Fix to find preceding name when 
point is
+    within delimited text; previously was not accounting for text opening 
delimiter.
+          (ibut:label-p): Clarify doc string.
+
+* hui.el (hui:hbut-delete): Improve doc on which implicit button key is used.
+
+* hbut.el (ibut:delete): Fix to delete all occurrences of the same ibut in 
current buffer.
+         (ibut:delete-occurrence): Add to delete a single named or unnamed 
ibut if
+    buffer is not read-only.
+          (ibut:to): Change 'hbut:label-regexp' to 'ibut:label-regexp'.
+
 2023-08-08  Bob Weiner  <rsw@gnu.org>
 
 * hui-mini.el (hui:menus): Remove delq from top-level menu where never
diff --git a/TAGS b/TAGS
index b2b77df672..90df6f5303 100644
--- a/TAGS
+++ b/TAGS
@@ -1,150 +1,152 @@
 
-hact.el,1868
-(defvar hrule:action 28,858
-(defvar symtable:category-plist 41,1468
-(defsubst symtable:hash-table 45,1633
-(defsubst symtable:name 49,1787
-(defsubst symtable:select 53,1898
-(defun    symtable:operate 58,2099
-(defun    symtable:create 97,3967
-(defvar   symtable:actypes 105,4359
-(defvar   symtable:ibtypes 111,4681
-(defsubst symtable:actype-p 117,5012
-(defsubst symtable:ibtype-p 122,5244
-(defun    symtable:add 127,5485
-(defalias 'symtable:delete symtable:delete133,5747
-(defun    symtable:get 135,5794
-(defun    symtable:remove 140,6025
-(defun    symset:create 151,6486
-(defun    symset:add 161,6900
-(defun    symset:clear 171,7228
-(defalias 'symset:delete symset:delete175,7329
-(defun    symset:get 177,7372
-(defun    symset:remove 181,7471
-(defun    htype:body 192,7976
-(defun    htype:category 196,8129
-(defmacro htype:create 208,8650
-(defun    htype:def-symbol 227,9474
-(defun    htype:delete 237,9864
-(defun    htype:doc 249,10331
-(defun    htype:names 253,10438
-(defun   htype:symbol 271,11261
-(defun action:commandp 282,11800
-(defun action:create 302,12512
-(defun action:kbd-macro 308,12727
-(defun action:params-emacs 312,12909
-(defun action:params 327,13457
-(defun action:param-list 348,14242
-(defun hact 359,14669
-(defun    actype:act 369,15162
-(defalias 'actype:elisp-symbol actype:elisp-symbol402,16681
-(defun    actype:def-symbol 404,16734
-(defun    actype:eval 414,17092
-(defun    actype:action 435,17933
-(defun    actype:action-body 452,18451
-(defmacro defact 464,18922
-(def-edebug-spec defact477,19521
-(def-edebug-spec lambda-list482,19665
-(defalias 'actype:create actype:create487,19786
-(defun    actype:delete 489,19822
-(defun    actype:doc 494,20003
-(defun    actype:identity 524,21038
-(defun    actype:interact 529,21220
-(defun    actype:params 537,21592
-(defun    actype:param-list 541,21728
-
-hactypes.el,1275
-(defact annot-bib 35,1258
-(defact completion 48,1722
-(defact display-boolean 58,2041
-(defact display-value 67,2375
-(defact display-variable 75,2620
-(defact eval-elisp 82,2863
-(defact exec-kbd-macro 87,3027
-(defact exec-shell-cmd 134,4857
-(defact exec-window-cmd 184,6921
-(defact hyp-config 219,8138
-(defact hyp-request 224,8332
-(defact hyp-source 244,9289
-(defact link-to-bookmark 257,9844
-(defact link-to-buffer-tmp 270,10401
-(defact link-to-directory 285,10982
-(defact link-to-ebut 290,11128
-(defact link-to-elisp-doc 327,12653
-(defun  hactypes:link-to-file-interactively 338,13124
-(defact link-to-file 404,15841
-(defact link-to-file-line 420,16472
-(defact link-to-file-line-and-column 434,17044
-(defact link-to-gbut 449,17722
-(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 548,22103
-(defact link-to-mail 568,22804
-(defact link-to-org-id 592,23971
-(defact link-to-org-id-marker 601,24284
-(defact link-to-regexp-match 611,24662
-(defact link-to-rfc 638,25709
-(defact link-to-string-match 645,25977
-(defact link-to-texinfo-node 654,26430
-(defact link-to-web-search 679,27483
-(defact man-show 687,27864
-(defact rfc-toc 695,28174
-(defact text-toc 722,29341
-
-hargs.el,963
-(defvar hargs:defaults 41,1440
-(defvar hargs:reading-type 44,1547
-(defalias 'hargs:find-tag-default hargs:find-tag-default54,1975
-(defun hargs:action-get 56,2031
-(defun hargs:buffer-substring 68,2569
-(defun hargs:delimited 78,3122
-(defun hargs:get 200,8096
-(defmacro hargs:make-iform-vector 237,9669
-(defun hargs:prompt 258,10582
-(defun hargs:select-event-window 267,10897
-(defun hargs:set-string-to-complete 277,11338
-(defun hargs:unset-string-to-complete 285,11694
-(defun hargs:sexpression-p 289,11829
-(defun hargs:actype-get 317,13012
-(defun hargs:at-p 324,13317
-(defun hargs:completion 444,17951
-(defun hargs:iform-read 516,20415
-(defun hargs:read 591,23357
-(defun hargs:read-buffer-name 632,24987
-(defun hargs:read-match 637,25174
-(defun hargs:select-p 670,26538
-(defvar hargs:reading-symbol 709,28072
-(defconst hargs:iform-vector712,28147
-(defconst hargs:iform-extensions-vector818,31667
-(defvar hargs:string-to-complete 877,34005
+hact.el,1917
+(defvar hrule:action 28,855
+(defvar symtable:category-plist 41,1465
+(defsubst symtable:hash-table 45,1630
+(defsubst symtable:name 49,1784
+(defsubst symtable:select 53,1895
+(defun    symtable:operate 58,2096
+(defun    symtable:create 97,3964
+(defvar   symtable:actypes 105,4356
+(defvar   symtable:ibtypes 111,4678
+(defsubst symtable:actype-p 117,5009
+(defsubst symtable:hyperbole-actype-p 125,5413
+(defsubst symtable:ibtype-p 132,5768
+(defun    symtable:add 137,6009
+(defalias 'symtable:delete symtable:delete143,6271
+(defun    symtable:get 145,6318
+(defun    symtable:remove 150,6549
+(defun    symset:create 161,7010
+(defun    symset:add 171,7424
+(defun    symset:clear 181,7752
+(defalias 'symset:delete symset:delete185,7853
+(defun    symset:get 187,7896
+(defun    symset:remove 191,7995
+(defun    htype:body 202,8500
+(defun    htype:category 206,8653
+(defmacro htype:create 218,9174
+(defun    htype:def-symbol 237,9998
+(defun    htype:delete 247,10388
+(defun    htype:doc 259,10855
+(defun    htype:names 263,10962
+(defun   htype:symbol 281,11785
+(defun action:commandp 292,12324
+(defun action:create 312,13036
+(defun action:kbd-macro 318,13251
+(defun action:params-emacs 322,13433
+(defun action:params 337,13981
+(defun action:param-list 358,14766
+(defun hact 369,15193
+(defun    actype:act 379,15686
+(defalias 'actype:elisp-symbol actype:elisp-symbol412,17215
+(defun    actype:def-symbol 414,17268
+(defun    actype:eval 424,17626
+(defun    actype:action 448,18560
+(defun    actype:action-body 466,19125
+(defmacro defact 478,19596
+(def-edebug-spec defact492,20222
+(def-edebug-spec lambda-list497,20366
+(defalias 'actype:create actype:create502,20487
+(defun    actype:delete 504,20523
+(defun    actype:doc 509,20704
+(defun    actype:identity 539,21739
+(defun    actype:interact 544,21921
+(defun    actype:params 552,22293
+(defun    actype:param-list 556,22429
+
+hactypes.el,1276
+(defact annot-bib 36,1324
+(defact completion 55,2029
+(defact display-boolean 65,2348
+(defact display-value 74,2690
+(defact display-variable 82,2935
+(defact eval-elisp 89,3178
+(defact exec-kbd-macro 94,3342
+(defact exec-shell-cmd 141,5172
+(defact exec-window-cmd 191,7236
+(defact hyp-config 226,8453
+(defact hyp-request 231,8647
+(defact hyp-source 251,9604
+(defact link-to-bookmark 264,10159
+(defact link-to-buffer-tmp 277,10716
+(defact link-to-directory 292,11297
+(defact link-to-ebut 297,11443
+(defact link-to-elisp-doc 334,12968
+(defun  hactypes:link-to-file-interactively 345,13439
+(defact link-to-file 411,16156
+(defact link-to-file-line 427,16787
+(defact link-to-file-line-and-column 441,17359
+(defact link-to-gbut 456,18037
+(defact link-to-Info-index-item 476,18810
+(defact link-to-Info-node 491,19567
+(defact link-to-ibut 506,20293
+(defact link-to-kcell 555,22408
+(defact link-to-mail 575,23143
+(defact link-to-org-id 599,24344
+(defact link-to-org-id-marker 608,24654
+(defact link-to-regexp-match 618,25036
+(defact link-to-rfc 645,26083
+(defact link-to-string-match 652,26351
+(defact link-to-texinfo-node 661,26804
+(defact link-to-web-search 686,27857
+(defact man-show 694,28238
+(defact rfc-toc 703,28577
+(defact text-toc 730,29747
+
+hargs.el,997
+(defvar hargs:defaults 42,1462
+(defvar hargs:reading-type 45,1569
+(defalias 'hargs:find-tag-default hargs:find-tag-default70,2663
+(defun hargs:action-get 72,2719
+(defun hargs:buffer-substring 84,3257
+(defun hargs:delimited 94,3810
+(defun hargs:get 216,8784
+(defmacro hargs:make-iform-vector 253,10357
+(defun hargs:match-p 281,11516
+(defun hargs:prompt 292,12051
+(defun hargs:select-event-window 301,12366
+(defun hargs:set-string-to-complete 311,12807
+(defun hargs:unset-string-to-complete 318,13144
+(defun hargs:sexpression-p 322,13279
+(defun hargs:actype-get 350,14462
+(defun hargs:at-p 357,14767
+(defun hargs:completion 542,22029
+(defun hargs:iform-read 616,24574
+(defun hargs:read 690,27384
+(defun hargs:read-buffer-name 732,29015
+(defun hargs:read-match 737,29202
+(defun hargs:select-p 771,30600
+(defvar hargs:reading-symbol 864,34012
+(defconst hargs:iform-vector867,34087
+(defconst hargs:iform-extensions-vector973,37604
+(defvar hargs:string-to-complete 1019,39371
 
 hbdata.el,879
-(defun hbdata:action 75,3128
-(defun hbdata:actype 79,3244
-(defun hbdata:args 93,3777
-(defun hbdata:categ 97,3878
-(defun hbdata:creator 101,3966
-(defun hbdata:create-time 105,4083
-(defun hbdata:key 109,4202
-(defun hbdata:loc-p 113,4297
-(defun hbdata:modifier 118,4491
-(defun hbdata:mod-time 123,4664
-(defun hbdata:referent 128,4834
-(defun hbdata:search 132,4925
-(defun hbdata:delete-entry 159,5996
-(defun hbdata:delete-entry-at-point 190,7142
-(defun hbdata:ebut-build 193,7242
-(defun hbdata:ebut-instance-last 267,10521
-(defun hbdata:get-entry 278,10914
-(defun hbdata:ibut-instance-next 287,11299
-(defun hbdata:ibut-instance-last 302,11843
-(defun hbdata:instance-next 318,12460
-(defun hbdata:to-entry 336,13064
-(defun hbdata:apply-entry 359,14026
-(defun hbdata:to-entry-buf 426,16212
-(defun hbdata:to-hbdata-buffer 473,18042
-(defun hbdata:write 497,19066
+(defun hbdata:action 75,3129
+(defun hbdata:actype 79,3245
+(defun hbdata:args 93,3778
+(defun hbdata:categ 97,3879
+(defun hbdata:creator 101,3967
+(defun hbdata:create-time 105,4084
+(defun hbdata:key 109,4203
+(defun hbdata:loc-p 113,4298
+(defun hbdata:modifier 118,4492
+(defun hbdata:mod-time 123,4665
+(defun hbdata:referent 128,4835
+(defun hbdata:search 132,4926
+(defun hbdata:delete-entry 159,5997
+(defun hbdata:delete-entry-at-point 190,7143
+(defun hbdata:ebut-build 193,7243
+(defun hbdata:ebut-instance-last 267,10522
+(defun hbdata:get-entry 278,10915
+(defun hbdata:ibut-instance-next 287,11300
+(defun hbdata:ibut-instance-last 302,11844
+(defun hbdata:instance-next 318,12461
+(defun hbdata:to-entry 336,13065
+(defun hbdata:apply-entry 359,14027
+(defun hbdata:to-entry-buf 426,16213
+(defun hbdata:to-hbdata-buffer 473,18043
+(defun hbdata:write 497,19067
 
 hbmap.el,259
 (defvar hbmap:filename 22,642
@@ -156,154 +158,155 @@ hbmap.el,259
 (defvar hbmap:dir-user112,4112
 (defvar hbmap:dir-filename120,4405
 
-hbut.el,5697
-(defconst hbut:max-len 32,987
-(defsubst hbut:max-len 39,1228
-(defvar   ebut:hattr-save 54,1813
-(defun    ebut:act 58,1930
-(defun    ebut:alist 69,2332
-(defun    ebut:at-p 75,2553
-(defun    ebut:create 82,2860
-(defun    ebut:delete 104,3861
-(defun    ebut:edit 117,4329
-(defun    ebut:get 130,4860
-(defun    ebut:is-p 199,7383
-(defun    ebut:key 204,7571
-(defun    ebut:key-of-label-p 211,7809
-(defalias 'ebut:to-key-src ebut:to-key-src216,8015
-(defalias 'ebut:key-src-set-buffer ebut:key-src-set-buffer217,8069
-(defalias 'ebut:key-src-fmt ebut:key-src-fmt218,8131
-(defalias 'ebut:key-to-label ebut:key-to-label219,8186
-(defun    ebut:label-p 221,8243
-(defalias 'ebut:label-regexp ebut:label-regexp284,10816
-(defalias 'ebut:label-instances-regexp ebut:label-instances-regexp285,10876
-(defalias 'ebut:label-to-key ebut:label-to-key287,10947
-(defun    ebut:list 289,10998
-(defalias 'map-ebut map-ebut311,11840
-(defun    ebut:map 313,11873
-(defun    ebut:next-occurrence 323,12364
-(defun    ebut:operate 338,13043
-(defun    ebut:program 447,17241
-(defun    ebut:search 478,18692
-(defun    ebut:to 557,21344
-(defun    ebut:delimit 591,22696
-(defun    ebut:match-regexp 618,23764
-(defconst ebut:label-start 629,24204
-(defconst ebut:label-end 631,24305
-(defconst hbut:instance-sep 633,24404
-(defun    gbut:act 640,24744
-(defun    gbut:delete 655,25359
-(defun    gbut:ebut-program 660,25582
-(defun    gbut:file 680,26473
-(defun    gbut:get 684,26631
-(defun    gbut:help 696,27045
-(defun    gbut:label-list 707,27467
-(defun    gbut:label-p 711,27586
-(defun    gbut:to 726,28401
-(defun    gbut:key-list 744,29058
-(defun    gbut:ebut-key-list 748,29184
-(defun    gbut:ibut-key-list 762,29645
-(defun    hattr:attributes 775,30154
-(defun    hattr:clear 785,30459
-(defun    hattr:copy 796,30835
-(defun hattr:emacs-button-attributes 807,31225
-(defun hattr:emacs-button-is-p 820,31715
-(defun    hattr:get 827,32001
-(defun    hattr:list 831,32135
-(defun    hattr:memq 839,32412
-(defun    hattr:report 851,32843
-(defun    hattr:save 879,33869
-(defun    hattr:set 897,34721
-(defalias 'hattr:summarize hattr:summarize901,34900
-(defvar   hattr:filename903,34944
-(defun    hbut:act 913,35377
-(defun    hbut:action 976,38080
-(defun    hbut:at-p 986,38388
-(defun    hbut:comment 999,38788
-(defvar   hbut:fill-prefix-regexps1032,40015
-(defun    hbut:fill-prefix-remove 1056,40863
-(defun    hbut:delete 1066,41255
-(defun    hbut:funcall 1081,41888
-(defun    hbut:get 1108,43020
-(defun    hbut:get-key-src 1119,43548
-(defun    hbut:is-p 1177,45835
-(defun    hbut:key 1182,45994
-(defun    hbut:to-key-src 1189,46214
-(defun    hbut:key-src-fmt 1196,46533
-(defun    hbut:key-src-set-buffer 1212,47183
-(defun    hbut:key-to-label 1234,47882
-(defun    hbut:label 1255,48566
-(defun    hbut:label-list 1262,48812
-(defun    hbut:label-p 1266,48966
-(defun    hbut:label-regexp 1279,49741
-(defun    hbut:label-instances-regexp 1309,50770
-(defun    hbut:label-to-key 1344,52009
-(defun    hbut:map 1357,52599
-(defvar   hbut:syntax-table 1414,54800
-(defun    hbut:modify-syntax 1420,55070
-(defun    hbut:outside-comment-p 1435,55697
-(defun    hbut:rename 1443,56057
-(defun    hbut:report 1454,56463
-(defun    hbut:source 1513,58397
-(defalias 'hbut:summarize hbut:summarize1528,58970
-(defun    hbut:to 1530,59011
-(defvar   hbut:current 1537,59339
-(defconst hbut:source-prefix 1540,59444
-(defun    hbut:key-list 1547,59775
-(defun    hbut:ebut-key-list 1551,59940
-(defun    hbut:ibut-key-list 1566,60465
-(defun    ibut:act 1580,61008
-(defun    ibut:alist 1591,61414
-(defun    ibut:at-p 1597,61643
-(defun    ibut:at-type-p 1616,62490
-(defun    ibut:set-name-and-label-key-p 1630,63100
-(cl-defun ibut:create 1707,65919
-(def-edebug-spec cl-defun1888,72147
-(def-edebug-spec lambda-key-list1893,72294
-(defun    ibut:delete 1899,72466
-(defun    ibut:delimit 1926,73472
-(defun    ibut:get 1953,74540
-(defun    ibut:is-p 1975,75357
-(defun    ibut:label-map 1983,75650
-(defun    ibut:label-key-match 1995,76239
-(defun    ibut:label-p 2005,76632
-(defun    ibut:label-regexp 2050,78660
-(defun    ibut:label-instances-regexp 2056,78951
-(defun    ibut:label-set 2062,79279
-(defun    ibut:label-sort-keys 2086,80370
-(defun    ibut:list 2105,81000
-(defun    ibut:key 2127,81851
-(defalias 'ibut:to-key-src ibut:to-key-src2134,82089
-(defalias 'ibut:key-to-label ibut:key-to-label2135,82136
-(defalias 'ibut:label-to-key ibut:label-to-key2136,82185
-(defalias 'map-ibut map-ibut2137,82234
-(defun    ibut:map 2139,82275
-(defun    ibut:next-occurrence 2151,82768
-(defun    ibut:operate 2166,83513
-(defun    ibut:insert-text 2342,90625
-(defun    ibut:previous-occurrence 2422,93902
-(defun    ibut:program 2437,94633
-(defun    ibut:rename 2465,95987
-(defalias 'ibut:summarize ibut:summarize2485,96922
-(defun    ibut:to 2487,96963
-(defun    ibut:at-to-name-p 2537,98690
-(defun    ibut:to-name 2561,99488
-(defun    ibut:to-text 2595,100827
-(defconst ibut:label-start 2646,102911
-(defconst ibut:label-end 2648,103012
-(defvar   ibut:label-separator 2651,103112
-(defvar   ibut:label-separator-regexp 2659,103429
-(defmacro defib 2666,103769
-(def-edebug-spec defib2703,105454
-(def-edebug-spec lambda-list2708,105594
-(defalias 'ibtype:create ibtype:create2713,105712
-(defun ibtype:activate-link 2715,105747
-(defmacro defil 2727,106196
-(defmacro defal 2824,110534
-(defalias 'ibtype:create-action-link-type 
ibtype:create-action-link-type2880,112703
-(defalias 'ibtype:create-regexp-link-type 
ibtype:create-regexp-link-type2881,112754
-(defun    ibtype:def-symbol 2883,112806
-(defun    ibtype:delete 2893,113163
+hbut.el,5757
+(defconst hbut:max-len 33,1059
+(defsubst hbut:max-len 40,1300
+(defvar   ebut:hattr-save 55,1885
+(defun    ebut:act 59,2002
+(defun    ebut:alist 70,2404
+(defun    ebut:at-p 76,2625
+(defun    ebut:create 83,2932
+(defun    ebut:delete 105,3933
+(defun    ebut:edit 118,4401
+(defun    ebut:get 131,4932
+(defun    ebut:is-p 200,7455
+(defun    ebut:key 205,7643
+(defun    ebut:key-of-label-p 212,7881
+(defalias 'ebut:to-key-src ebut:to-key-src217,8087
+(defalias 'ebut:key-src-set-buffer ebut:key-src-set-buffer218,8141
+(defalias 'ebut:key-src-fmt ebut:key-src-fmt219,8203
+(defalias 'ebut:key-to-label ebut:key-to-label220,8258
+(defun    ebut:label-p 224,8340
+(defalias 'ebut:label-regexp ebut:label-regexp287,10913
+(defalias 'ebut:label-instances-regexp ebut:label-instances-regexp288,10973
+(defalias 'ebut:label-to-key ebut:label-to-key290,11044
+(defun    ebut:list 292,11095
+(defalias 'map-ebut map-ebut314,11937
+(defun    ebut:map 316,11970
+(defun    ebut:next-occurrence 326,12461
+(defun    ebut:operate 341,13140
+(defun    ebut:program 450,17338
+(defun    ebut:search 481,18771
+(defun    ebut:to 560,21423
+(defun    ebut:delimit 594,22775
+(defun    ebut:match-regexp 621,23843
+(defconst ebut:label-start 632,24283
+(defconst ebut:label-end 634,24384
+(defconst hbut:instance-sep 636,24483
+(defun    gbut:act 643,24823
+(defun    gbut:delete 658,25438
+(defun    gbut:ebut-program 663,25661
+(defun    gbut:file 683,26552
+(defun    gbut:get 687,26710
+(defun    gbut:help 699,27124
+(defun    gbut:label-list 710,27547
+(defun    gbut:label-p 714,27666
+(defun    gbut:to 729,28481
+(defun    gbut:key-list 747,29138
+(defun    gbut:ebut-key-list 751,29264
+(defun    gbut:ibut-key-list 765,29725
+(defun    hattr:attributes 778,30234
+(defun    hattr:clear 788,30539
+(defun    hattr:copy 799,30915
+(defun    hattr:emacs-button-attributes 810,31305
+(defun    hattr:emacs-button-is-p 823,31798
+(defun    hattr:get 830,32087
+(defun    hattr:list 834,32221
+(defun    hattr:memq 842,32498
+(defun    hattr:report 854,32929
+(defun    hattr:save 882,33955
+(defun    hattr:set 900,34807
+(defalias 'hattr:summarize hattr:summarize904,34986
+(defvar   hattr:filename906,35030
+(defun    hbut:act 916,35463
+(defun    hbut:action 978,38160
+(defun    hbut:at-p 989,38496
+(defun    hbut:comment 1002,38896
+(defvar   hbut:fill-prefix-regexps1035,40123
+(defun    hbut:fill-prefix-remove 1059,40971
+(defun    hbut:delete 1069,41363
+(defun    hbut:funcall 1084,41996
+(defun    hbut:get 1111,43128
+(defun    hbut:get-key-src 1122,43656
+(defun    hbut:is-p 1180,45943
+(defun    hbut:key 1185,46102
+(defun    hbut:to-key-src 1192,46322
+(defun    hbut:key-src-fmt 1199,46641
+(defun    hbut:key-src-set-buffer 1215,47291
+(defun    hbut:key-to-label 1237,47990
+(defun    hbut:label 1258,48674
+(defun    hbut:label-list 1265,48920
+(defun    hbut:label-p 1269,49074
+(defun    hbut:label-regexp 1282,49849
+(defun    hbut:label-instances-regexp 1312,50878
+(defun    hbut:label-to-key 1347,52117
+(defun    hbut:map 1360,52707
+(defvar   hbut:syntax-table 1418,54908
+(defun    hbut:modify-syntax 1424,55178
+(defun    hbut:outside-comment-p 1439,55805
+(defun    hbut:rename 1447,56165
+(defun    hbut:report 1458,56571
+(defun    hbut:source 1517,58505
+(defalias 'hbut:summarize hbut:summarize1532,59078
+(defun    hbut:to 1534,59120
+(defvar   hbut:current 1541,59448
+(defconst hbut:source-prefix 1544,59553
+(defun    hbut:key-list 1551,59884
+(defun    hbut:ebut-key-list 1555,60049
+(defun    hbut:ibut-key-list 1570,60574
+(defun    ibut:act 1584,61117
+(defun    ibut:alist 1595,61523
+(defun    ibut:at-p 1601,61752
+(defun    ibut:at-type-p 1620,62569
+(defun    ibut:set-name-and-label-key-p 1634,63179
+(cl-defun ibut:create 1728,66693
+(def-edebug-spec cl-defun1914,73132
+(def-edebug-spec lambda-key-list1919,73279
+(defun    ibut:delete 1928,73502
+(defun    ibut:delete-occurrence 1963,74811
+(defun    ibut:delimit 1972,75138
+(defun    ibut:get 2002,76330
+(defun    ibut:is-p 2024,77147
+(defun    ibut:label-map 2032,77440
+(defun    ibut:label-key-match 2044,78029
+(defun    ibut:label-p 2054,78422
+(defun    ibut:label-regexp 2099,80427
+(defun    ibut:label-instances-regexp 2105,80718
+(defun    ibut:label-set 2111,81046
+(defun    ibut:label-sort-keys 2135,82137
+(defun    ibut:list 2154,82767
+(defun    ibut:key 2176,83618
+(defalias 'ibut:to-key-src ibut:to-key-src2183,83861
+(defalias 'ibut:key-to-label ibut:key-to-label2184,83909
+(defalias 'ibut:label-to-key ibut:label-to-key2185,83959
+(defalias 'map-ibut map-ibut2186,84009
+(defun    ibut:map 2188,84051
+(defun    ibut:next-occurrence 2200,84542
+(defun    ibut:operate 2215,85287
+(defun    ibut:insert-text 2400,93715
+(defun    ibut:previous-occurrence 2481,97038
+(defun    ibut:program 2496,97769
+(defun    ibut:rename 2540,99872
+(defalias 'ibut:summarize ibut:summarize2562,100891
+(defun    ibut:to 2564,100933
+(defun    ibut:at-to-name-p 2615,102698
+(defun    ibut:to-name 2639,103496
+(defun    ibut:to-text 2672,104808
+(defconst ibut:label-start 2723,106861
+(defconst ibut:label-end 2725,106962
+(defvar   ibut:label-separator 2728,107062
+(defvar   ibut:label-separator-regexp 2736,107379
+(defmacro defib 2743,107719
+(def-edebug-spec defib2778,109356
+(def-edebug-spec lambda-list2783,109496
+(defalias 'ibtype:create ibtype:create2788,109614
+(defun    ibtype:activate-link 2790,109649
+(defmacro defil 2802,110101
+(defmacro defal 2899,114439
+(defalias 'ibtype:create-action-link-type 
ibtype:create-action-link-type2955,116608
+(defalias 'ibtype:create-regexp-link-type 
ibtype:create-regexp-link-type2956,116659
+(defun    ibtype:def-symbol 2958,116711
+(defun    ibtype:delete 2968,117068
 
 hgnus.el,110
 (defun Gnus-init 54,1683
@@ -373,38 +376,39 @@ hib-kbd.el,1074
 (defconst kbd-key:extended-command-binding-list 543,23129
 (defvar kbd-key:mini-menu-key 546,23309
 
-hib-social.el,1334
-(defcustom hibtypes-social-default-service 184,9123
-(defcustom hibtypes-social-display-function 194,9413
-(defcustom hibtypes-git-default-project 199,9600
-(defcustom hibtypes-git-use-magit-flag 204,9759
-(defcustom hibtypes-github-default-project 209,9926
-(defcustom hibtypes-github-default-user 214,10085
-(defcustom hibtypes-gitlab-default-project 219,10238
-(defcustom hibtypes-gitlab-default-user 224,10397
-(defconst hibtypes-social-hashtag-alist237,10962
-(defconst hibtypes-social-username-alist246,11535
-(defconst hibtypes-git-project-regexp 255,12041
-(defconst hibtypes-git-file-regexp 256,12128
-(defconst hibtypes-social-regexp258,12202
-(defvar hibtypes-social-inhibit-modes 264,12479
-(defib social-reference 271,12808
-(defun social-reference 325,15287
-(defun github-reference 346,16328
-(defun gitlab-reference 455,21594
-(defib git-commit-reference 621,29192
-(defvar hibtypes-git-repos-cache637,29935
-(defun hibtypes-git-get-locate-command 641,30109
-(defun hibtypes-git-build-repos-cache 648,30409
-(defun hibtypes-git-add-project-to-repos-cache 663,31254
-(defun hibtypes-git-build-or-add-to-repos-cache 682,32104
-(defun hibtypes-git-project-directory 692,32636
-(defun git-reference 711,33593
-(defun hibtypes-git-find-execute 851,40416
-(defun hibtypes-git-find 864,41036
-(defun git-find-file 894,42345
-
-hibtypes.el,1674
+hib-social.el,1373
+(defgroup hyperbole-buttons 184,9122
+(defcustom hibtypes-social-default-service 188,9243
+(defcustom hibtypes-social-display-function 198,9534
+(defcustom hibtypes-git-default-project 203,9722
+(defcustom hibtypes-git-use-magit-flag 208,9882
+(defcustom hibtypes-github-default-project 213,10050
+(defcustom hibtypes-github-default-user 218,10210
+(defcustom hibtypes-gitlab-default-project 223,10364
+(defcustom hibtypes-gitlab-default-user 228,10524
+(defconst hibtypes-social-hashtag-alist241,11090
+(defconst hibtypes-social-username-alist250,11663
+(defconst hibtypes-git-project-regexp 259,12169
+(defconst hibtypes-git-file-regexp 260,12256
+(defconst hibtypes-social-regexp262,12330
+(defvar hibtypes-social-inhibit-modes 268,12607
+(defib social-reference 275,12936
+(defun social-reference 329,15415
+(defun github-reference 350,16456
+(defun gitlab-reference 459,21722
+(defib git-commit-reference 625,29320
+(defvar hibtypes-git-repos-cache641,30063
+(defun hibtypes-git-get-locate-command 645,30237
+(defun hibtypes-git-build-repos-cache 652,30537
+(defun hibtypes-git-add-project-to-repos-cache 667,31382
+(defun hibtypes-git-build-or-add-to-repos-cache 686,32232
+(defun hibtypes-git-project-directory 696,32764
+(defun git-reference 715,33721
+(defun hibtypes-git-find-execute 855,40544
+(defun hibtypes-git-find 868,41164
+(defun git-find-file 898,42473
+
+hibtypes.el,1680
 (defconst hypb-mail-address-tld-regexp49,1510
 (defconst hypb-mail-address-regexp77,3374
 (defib python-tb-previous-line 111,4849
@@ -414,49 +418,49 @@ hibtypes.el,1674
 (defvar mail-address-mode-list308,14126
 (defun mail-address-at-p 312,14276
 (defib mail-address 323,14766
-(defib org-link-outside-org-mode 363,16652
-(defib annot-bib 382,17546
-(defun markdown-follow-link-p 403,18545
-(defun markdown-follow-inline-link-p 424,19210
-(defib markdown-internal-link 451,20494
-(defib rfc-toc 481,22038
-(defib id-cflow 506,23108
-(defib ctags 553,25162
-(defib etags 579,26564
-(defib cscope 616,28469
-(defib text-toc 643,29621
-(defib dir-summary 675,31203
-(defib rfc 711,32773
-(defib man-apropos 745,34227
-(defun hlink 773,35483
-(defun parse-label-and-file 793,36470
-(defconst elink:start 815,37375
-(defconst elink:end 817,37480
-(defib elink 820,37578
-(defconst glink:start 830,37979
-(defconst glink:end 832,38082
-(defib glink 835,38178
-(defconst ilink:start 844,38468
-(defconst ilink:end 846,38573
-(defib ilink 849,38671
-(defib pathname-line-and-column 864,39327
-(defib ipython-stack-frame 892,40920
-(defib ripgrep-msg 934,43082
-(defib grep-msg 980,45223
-(defun hib-python-traceback 1048,49071
-(defib debugger-source 1059,49683
-(defib elisp-compiler-msg 1145,53724
-(defib patch-msg 1247,58795
-(defib texinfo-ref 1274,59999
-(defib gnus-push-button 1359,64597
-(defib Info-node 1371,65139
-(defib hyp-address 1404,66828
-(defib hyp-source 1423,67842
-(defconst action:start 1450,68961
-(defconst action:end 1453,69070
-(defib action 1462,69420
-(defun action:help 1560,73796
-(defib completion 1587,74888
+(defib org-link-outside-org-mode 363,16653
+(defib annot-bib 384,17676
+(defun markdown-follow-link-p 411,18831
+(defun markdown-follow-inline-link-p 432,19496
+(defib markdown-internal-link 459,20780
+(defib rfc-toc 489,22324
+(defib id-cflow 514,23394
+(defib ctags 561,25448
+(defib etags 587,26850
+(defib cscope 624,28755
+(defib text-toc 651,29907
+(defib dir-summary 683,31489
+(defib rfc 719,33059
+(defib man-apropos 753,34513
+(defun hlink 781,35769
+(defun hlink:parse-label-and-file 801,36762
+(defconst elink:start 823,37679
+(defconst elink:end 825,37784
+(defib elink 828,37882
+(defconst glink:start 838,38283
+(defconst glink:end 840,38386
+(defib glink 843,38482
+(defconst ilink:start 852,38772
+(defconst ilink:end 854,38877
+(defib ilink 857,38975
+(defib pathname-line-and-column 872,39631
+(defib ipython-stack-frame 900,41224
+(defib ripgrep-msg 942,43386
+(defib grep-msg 988,45527
+(defun hib-python-traceback 1056,49376
+(defib debugger-source 1067,49988
+(defib elisp-compiler-msg 1153,54029
+(defib patch-msg 1255,59100
+(defib texinfo-ref 1282,60304
+(defib gnus-push-button 1367,64902
+(defib Info-node 1379,65444
+(defib hyp-address 1412,67133
+(defib hyp-source 1431,68147
+(defconst action:start 1458,69266
+(defconst action:end 1461,69375
+(defib action 1470,69725
+(defun action:help 1565,73961
+(defib completion 1592,75053
 
 hinit.el,145
 (defvar   hyperb:user-email 22,623
@@ -465,16 +469,16 @@ hinit.el,145
 (defun hyperb:check-dir-user 71,2629
 
 hload-path.el,484
-(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
+(defvar hyperb:microsoft-os-p28,856
+(defvar hyperb:wsl-os-p34,1110
+(defvar hyperb:dir 42,1494
+(defmacro hyperb:with-suppressed-warnings 83,3242
+(defalias 
'hload-path--make-directory-autoloadshload-path--make-directory-autoloads118,4687
+(defun hload-path--internal-make-directory-autoloads 126,4958
+(defun hyperb:autoloads-exist-p 149,6026
+(defun hyperb:maybe-generate-autoloads 155,6321
+(defun hyperb:generate-autoloads 161,6590
+(defun hyperb:maybe-load-autoloads 176,7364
 
 hmail.el,876
 (defvar hnews:composer 38,1419
@@ -550,112 +554,112 @@ hmouse-info.el,570
 (defun Info-note-at-p 352,12910
 (defun Info-read-index-item-name-1 366,13480
 
-hmouse-drv.el,4135
-(defvar hmouse-verify-release-window-flag 35,1102
-(defvar action-key-depressed-flag 46,1660
-(defvar assist-key-depressed-flag 47,1734
-(defvar action-key-depress-args 48,1808
-(defvar assist-key-depress-args 50,1918
-(defvar action-key-release-args 53,2029
-(defvar assist-key-release-args 55,2139
-(defvar action-key-depress-buffer 58,2250
-(defvar assist-key-depress-buffer 61,2421
-(defvar action-key-release-buffer 64,2592
-(defvar assist-key-release-buffer 66,2696
-(defvar action-key-depress-window 69,2801
-(defvar assist-key-depress-window 72,2972
-(defvar action-key-release-window 75,3143
-(defvar assist-key-release-window 77,3247
-(defvar action-key-depress-position 81,3418
-(defvar assist-key-depress-position 83,3540
-(defvar action-key-release-position 85,3662
-(defvar assist-key-release-position 87,3783
-(defvar action-key-depress-prev-point 90,3905
-(defvar assist-key-depress-prev-point 93,4074
-(defvar action-key-release-prev-point 96,4243
-(defvar assist-key-release-prev-point 99,4412
-(defvar action-key-cancelled 103,4582
-(defvar assist-key-cancelled 105,4667
-(defvar action-key-help-flag 108,4753
-(defvar assist-key-help-flag 110,4857
-(defvar assist-flag 113,4962
-(defcustom hkey-debug 118,5172
-(defvar hkey-region 124,5347
-(defvar action-mouse-key-prev-window 156,6406
-(defvar action-mouse-key-prefix-arg 159,6531
-(defvar hkey-help-msg 162,6627
-(defvar hkey--wconfig 163,6690
-(defun hkey-absolute-pixel-position 170,7007
-(defun action-key-depress 177,7279
-(defun assist-key-depress 202,8292
-(defun action-key-depress-emacs 227,9305
-(defun assist-key-depress-emacs 232,9456
-(defun action-mouse-key-emacs 238,9639
-(defun assist-mouse-key-emacs 244,9885
-(defun action-mouse-key 250,10131
-(defun assist-mouse-key 273,11027
-(defun action-key-clear-variables 297,11935
-(defun assist-key-clear-variables 312,12445
-(defun action-key 327,12955
-(defun action-key-internal 338,13390
-(defun assist-key 348,13679
-(defun assist-key-internal 359,14116
-(defun hkey-either 369,14403
-(defun hkey-ace-window-setup 391,15311
-(defun hkey-drag 435,17168
-(defun hkey-drag-stay 467,18538
-(defun hkey-drag-item 482,19105
-(defun hkey-drag-to 515,20501
-(defun hkey-link 547,21879
-(defun hkey-replace 552,22055
-(defun hkey-swap 562,22504
-(defun hkey-throw 591,23861
-(defun hkey-window-link 624,25338
-(defun hkey-insert-region 652,26506
-(defun hkey-buffer-to 687,28143
-(defun hkey-swap-buffers 698,28573
-(defun hmouse-click-to-drag 716,29355
-(defun hmouse-click-to-drag-stay 724,29640
-(defun hmouse-click-to-drag-item 732,29923
-(defun hmouse-click-to-drag-to 740,30211
-(defun hmouse-click-to-replace 748,30506
-(defun hmouse-click-to-swap 759,30908
-(defun hmouse-click-to-throw 767,31171
-(defun hmouse-choose-link-and-referent-windows 774,31463
-(defun hmouse-choose-windows 810,33282
-(defun hmouse-keyboard-choose-windows 837,34340
-(defun hkey-buffer-move-left 867,35538
-(defun hkey-buffer-move-right 873,35715
-(defun hkey-buffer-move-down 879,35894
-(defun hkey-buffer-move-up 885,36068
-(defun hkey-buffer-move 890,36226
-(defun mouse-drag-mode-line 932,38040
-(defun hkey-debug 962,39415
-(defun hkey-execute 990,40422
-(defun hkey-help 1022,41759
-(defun hkey-assist-help 1167,46994
-(defun hkey-help-hide 1179,47426
-(defalias 'quit-window quit-window1194,47962
-(defun hkey-help-show 1205,48395
-(defun hkey-mouse-help 1255,50669
-(defun hkey-operate 1294,52160
-(defun hkey-summarize 1338,53972
-(defun hkey-toggle-debug 1359,54733
-(defun hmouse-depress-inactive-minibuffer-p 1372,55287
-(defun hmouse-vertical-line-spacing 1384,55790
-(defun hmouse-window-at-absolute-pixel-position 1396,56298
-(defun hmouse-window-coordinates 1508,61582
-(defun hmouse-key-release-buffer 1550,63463
-(defun hmouse-key-release-window 1557,63761
-(defun hmouse-key-release-args-emacs 1562,63995
-(defun hmouse-use-region-p 1592,65421
-(defun hmouse-save-region 1597,65576
-(defun hmouse-set-point 1614,66375
-(defun hmouse-set-point-at 1624,66838
-(defun hmouse-release 1645,67766
-(defun hmouse-function 1667,68824
-(defun smart-scroll-down 1696,70156
-(defun smart-scroll-up 1721,71062
+hmouse-drv.el,4136
+(defvar hmouse-verify-release-window-flag 37,1121
+(defvar action-key-depressed-flag 48,1679
+(defvar assist-key-depressed-flag 49,1753
+(defvar action-key-depress-args 50,1827
+(defvar assist-key-depress-args 52,1937
+(defvar action-key-release-args 55,2048
+(defvar assist-key-release-args 57,2158
+(defvar action-key-depress-buffer 60,2269
+(defvar assist-key-depress-buffer 63,2440
+(defvar action-key-release-buffer 66,2611
+(defvar assist-key-release-buffer 68,2715
+(defvar action-key-depress-window 71,2820
+(defvar assist-key-depress-window 74,2991
+(defvar action-key-release-window 77,3162
+(defvar assist-key-release-window 79,3266
+(defvar action-key-depress-position 83,3437
+(defvar assist-key-depress-position 85,3559
+(defvar action-key-release-position 87,3681
+(defvar assist-key-release-position 89,3802
+(defvar action-key-depress-prev-point 92,3924
+(defvar assist-key-depress-prev-point 95,4093
+(defvar action-key-release-prev-point 98,4262
+(defvar assist-key-release-prev-point 101,4431
+(defvar action-key-cancelled 105,4601
+(defvar assist-key-cancelled 107,4686
+(defvar action-key-help-flag 110,4772
+(defvar assist-key-help-flag 112,4876
+(defvar assist-flag 115,4981
+(defcustom hkey-debug 120,5191
+(defvar hkey-region 126,5366
+(defvar action-mouse-key-prev-window 158,6425
+(defvar action-mouse-key-prefix-arg 161,6550
+(defvar hkey-help-msg 164,6646
+(defvar hkey--wconfig 165,6709
+(defun hkey-absolute-pixel-position 172,7026
+(defun action-key-depress 179,7298
+(defun assist-key-depress 204,8311
+(defun action-key-depress-emacs 229,9324
+(defun assist-key-depress-emacs 234,9475
+(defun action-mouse-key-emacs 240,9658
+(defun assist-mouse-key-emacs 246,9904
+(defun action-mouse-key 252,10150
+(defun assist-mouse-key 275,11046
+(defun action-key-clear-variables 299,11954
+(defun assist-key-clear-variables 314,12464
+(defun action-key 329,12974
+(defun action-key-internal 342,13470
+(defun assist-key 352,13757
+(defun assist-key-internal 365,14255
+(defun hkey-either 375,14540
+(defun hkey-ace-window-setup 397,15448
+(defun hkey-drag 441,17305
+(defun hkey-drag-stay 473,18675
+(defun hkey-drag-item 488,19242
+(defun hkey-drag-to 521,20638
+(defun hkey-link 553,22016
+(defun hkey-replace 558,22192
+(defun hkey-swap 568,22641
+(defun hkey-throw 597,23998
+(defun hkey-window-link 630,25475
+(defun hkey-insert-region 653,26385
+(defun hkey-buffer-to 688,28022
+(defun hkey-swap-buffers 699,28452
+(defun hmouse-click-to-drag 717,29234
+(defun hmouse-click-to-drag-stay 725,29519
+(defun hmouse-click-to-drag-item 733,29802
+(defun hmouse-click-to-drag-to 741,30090
+(defun hmouse-click-to-replace 749,30385
+(defun hmouse-click-to-swap 760,30787
+(defun hmouse-click-to-throw 768,31050
+(defun hmouse-choose-link-and-referent-windows 775,31342
+(defun hmouse-choose-windows 813,33213
+(defun hmouse-keyboard-choose-windows 840,34271
+(defun hkey-buffer-move-left 870,35469
+(defun hkey-buffer-move-right 876,35646
+(defun hkey-buffer-move-down 882,35825
+(defun hkey-buffer-move-up 888,35999
+(defun hkey-buffer-move 893,36157
+(defun mouse-drag-mode-line 935,37971
+(defun hkey-debug 965,39346
+(defun hkey-execute 993,40353
+(defun hkey-help 1025,41690
+(defun hkey-assist-help 1165,46788
+(defun hkey-help-hide 1177,47220
+(defalias 'quit-window quit-window1192,47756
+(defun hkey-help-show 1203,48189
+(defun hkey-mouse-help 1253,50463
+(defun hkey-operate 1292,51954
+(defun hkey-summarize 1336,53766
+(defun hkey-toggle-debug 1357,54527
+(defun hmouse-depress-inactive-minibuffer-p 1370,55081
+(defun hmouse-vertical-line-spacing 1382,55584
+(defun hmouse-window-at-absolute-pixel-position 1394,56092
+(defun hmouse-window-coordinates 1506,61376
+(defun hmouse-key-release-buffer 1548,63257
+(defun hmouse-key-release-window 1555,63555
+(defun hmouse-key-release-args-emacs 1560,63789
+(defun hmouse-use-region-p 1590,65215
+(defun hmouse-save-region 1595,65370
+(defun hmouse-set-point 1612,66169
+(defun hmouse-set-point-at 1622,66632
+(defun hmouse-release 1643,67560
+(defun hmouse-function 1665,68618
+(defun smart-scroll-down 1694,69950
+(defun smart-scroll-up 1719,70856
 
 hmouse-key.el,393
 (defun hmouse-check-action-key 38,1285
@@ -665,9 +669,9 @@ hmouse-key.el,393
 (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
+(defvar hmouse-bindings 143,5901
+(defvar hmouse-bindings-flag 146,5991
+(defvar hmouse-previous-bindings 149,6085
 
 hmouse-mod.el,403
 (defvar hmouse-mod--global-map 74,2697
@@ -682,17 +686,17 @@ hmouse-mod.el,403
 (defun hmouse-mod-last-char 206,8116
 
 hmouse-sh.el,449
-(defun hmouse-bind-key-emacs 55,1768
-(defun hmouse-bind-shifted-key-emacs 172,5083
-(defun hmouse-get-bindings 279,8394
-(defun hmouse-get-unshifted-bindings 354,11687
-(defun hmouse-posn-set-point 394,13250
-(defun hmouse-drag-region 408,13886
-(defun hmouse-move-point-emacs 430,14920
-(defun hmouse-move-point-eterm 468,16851
-(defun hmouse-set-key-list 471,16932
-(defun hmouse-shifted-setup 475,17046
-(defun hmouse-unshifted-setup 510,18819
+(defun hmouse-bind-key-emacs 55,1767
+(defun hmouse-bind-shifted-key-emacs 172,5082
+(defun hmouse-get-bindings 279,8393
+(defun hmouse-get-unshifted-bindings 354,11686
+(defun hmouse-posn-set-point 394,13249
+(defun hmouse-drag-region 412,14031
+(defun hmouse-move-point-emacs 437,15125
+(defun hmouse-move-point-eterm 475,17056
+(defun hmouse-set-key-list 478,17137
+(defun hmouse-shifted-setup 482,17251
+(defun hmouse-unshifted-setup 517,19024
 
 hmouse-tag.el,3201
 (define-obsolete-variable-alias 
'smart-asm-include-dirssmart-asm-include-dirs59,2265
@@ -740,36 +744,36 @@ hmouse-tag.el,3201
 (defun smart-lisp-at-change-log-tag-p 722,31396
 (defun smart-lisp-htype-tag 733,31869
 (defun smart-lisp-at-tag-p 756,32711
-(defun smart-lisp-at-non-htype-tag-p 764,33053
-(defun smart-lisp-mode-p 795,34496
-(defun smart-objc 801,34673
-(defun smart-objc-tag 830,35968
-(defun smart-objc-oo-browser 854,36847
-(defconst smart-objc-keywords875,37740
-(defun smart-objc-at-tag-p 880,37930
-(defun smart-jedi-find-file 895,38602
-(defun smart-python-jedi-to-definition-p 902,38902
-(defun smart-python 927,40101
-(defun smart-python-tag 952,41139
-(defun smart-python-oo-browser 963,41583
-(defconst smart-python-keywords979,42284
-(defun smart-python-at-tag-p 987,42648
-(defun smart-ancestor-tag-files 1018,43835
-(defun smart-asm-include-file 1037,44521
-(defun smart-c-include-file 1081,46062
-(defun smart-flash-tag 1126,47531
-(defun smart-lisp-at-known-identifier-p 1137,47948
-(defun smart-lisp-bound-symbol-def 1165,49030
-(defun smart-tags-find-p 1175,49481
-(defun smart-java-cross-reference 1186,49914
-(defun smart-java-library-path 1274,53792
-(defun smart-java-packages 1291,54453
-(defun smart-library-symbol 1362,57164
-(defun smart-tags-display 1377,57723
-(defun smart-tags-file-path 1411,59264
-(defun smart-tags-org-src-block-p 1434,60115
-(defun smart-tags-file-list 1439,60303
-(defun smart-tags-noselect-function 1476,62027
+(defun smart-lisp-at-non-htype-tag-p 764,33052
+(defun smart-lisp-mode-p 795,34495
+(defun smart-objc 801,34672
+(defun smart-objc-tag 830,35967
+(defun smart-objc-oo-browser 854,36846
+(defconst smart-objc-keywords875,37739
+(defun smart-objc-at-tag-p 880,37929
+(defun smart-jedi-find-file 895,38601
+(defun smart-python-jedi-to-definition-p 902,38901
+(defun smart-python 927,40100
+(defun smart-python-tag 952,41138
+(defun smart-python-oo-browser 963,41582
+(defconst smart-python-keywords979,42283
+(defun smart-python-at-tag-p 987,42647
+(defun smart-ancestor-tag-files 1018,43834
+(defun smart-asm-include-file 1037,44520
+(defun smart-c-include-file 1081,46061
+(defun smart-flash-tag 1126,47530
+(defun smart-lisp-at-known-identifier-p 1137,47947
+(defun smart-lisp-bound-symbol-def 1165,49029
+(defun smart-tags-find-p 1175,49480
+(defun smart-java-cross-reference 1186,49913
+(defun smart-java-library-path 1274,53791
+(defun smart-java-packages 1291,54452
+(defun smart-library-symbol 1362,57163
+(defun smart-tags-display 1377,57722
+(defun smart-tags-file-path 1411,59205
+(defun smart-tags-org-src-block-p 1434,60056
+(defun smart-tags-file-list 1439,60244
+(defun smart-tags-noselect-function 1476,61968
 
 hpath.el,5601
 (defcustom hpath:auto-completing-read-modes 42,1401
@@ -827,80 +831,80 @@ hpath.el,5601
 (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 970,43015
-(defun hpath:is-path-variable-p 1065,47494
-(defun hpath:choose-from-path-variable 1072,47794
-(defun hpath:delimited-possible-path 1089,48682
-(defun hpath:display-buffer 1142,51058
-(defun hpath:display-buffer-other-frame 1158,51794
-(defun hpath:display-buffer-function 1179,52589
-(defun hpath:display-path-function 1184,52845
-(defun hpath:resolve 1189,53096
-(defun hpath:expand 1211,54110
-(defun hpath:prepend-shell-directory 1240,55582
-(defvar hpath:compressed-suffix-regexp 1274,57380
-(defun hpath:expand-with-variable 1277,57536
-(defun hpath:file-line-and-column 1315,59255
-(defun hpath:find-noselect 1333,60132
-(defun hpath:find 1342,60481
-(defun hpath:to-markup-anchor 1507,67466
-(defun hpath:find-executable 1572,70281
-(defun hpath:find-line 1587,70785
-(defun hpath:find-other-frame 1607,71555
-(defun hpath:find-other-window 1622,72033
-(defun hpath:get-external-display-alist 1632,72528
-(defun hpath:is-p 1651,73517
-(defun hpath:push-tag-mark 1753,78357
-(defun hpath:relative-arguments 1767,78869
-(defun hpath:relative-to 1777,79299
-(defun hpath:rfc 1809,80587
-(defun hpath:start-end 1814,80760
-(defun hpath:return-one-value 1843,81964
-(defun hpath:substitute-value 1881,83645
-(defun hpath:substitute-var 1925,85300
-(defun hpath:symlink-referent 1963,86766
-(defun hpath:symlink-expand 1978,87361
-(defun hpath:to-line 2013,89000
-(defun hpath:trim 2022,89287
-(defun hpath:normalize 2031,89625
-(defun hpath:validate 2039,90011
-(defun hpath:find-file-urls-p 2062,90918
-(defun hpath:handle-urls 2068,91177
-(defalias 
'hyperb:substitute-in-file-namehyperb:substitute-in-file-name2085,91919
-(defun substitute-in-file-name 2088,92010
-(defun hpath:enable-find-file-urls 2101,92652
-(defun hpath:disable-find-file-urls 2132,93782
-(defun hpath:find-file-urls-mode 2161,94817
-(defun hpath:url-at-p 2173,95304
-(defun hpath:url-p 2184,95795
-(defun hpath:www-at-p 2195,96190
-(defun hpath:www-p 2211,96887
-(defun hpath:command-string 2219,97210
-(defun hpath:display-where-function 2228,97617
-(defun hpath:remote-available-p 2238,98087
-(defun hpath:remote-default-user 2257,98934
-(defun hpath:delete-trailer 2271,99390
-(defun hpath:exists-p 2279,99674
-(defun hpath:find-file-mailcap 2310,100671
-(defun hpath:find-program 2326,101187
-(defun hpath:match 2347,102058
-(defun hpath:get-single-string-variable-value 2361,102658
-(defun hpath:substitute-dir 2391,103752
-(defun hpath:substitute-match-value 2457,106835
-(defun hpath:substitute-var-name 2519,109051
+(defconst hpath:markdown-suffix-regexp 667,30696
+(defconst hpath:outline-section-pattern 670,30802
+(defvar hpath:prefix-regexp 674,31037
+(defvar hpath:remote-regexp681,31344
+(defconst hpath:shell-modes 685,31511
+(defconst hpath:texinfo-section-pattern 688,31655
+(defun hpath:abbreviate-file-name 696,32012
+(defun hpath:absolute-arguments 703,32262
+(defun hpath:absolute-to 727,33213
+(defun hpath:tramp-file-name-regexp 766,34595
+(defun hpath:remote-at-p 780,35235
+(defun hpath:remote-p 848,38029
+(defun hpath:at-p 919,40591
+(defun hpath:call 970,43041
+(defun hpath:is-path-variable-p 1065,47520
+(defun hpath:choose-from-path-variable 1072,47820
+(defun hpath:delimited-possible-path 1089,48708
+(defun hpath:display-buffer 1142,51084
+(defun hpath:display-buffer-other-frame 1158,51820
+(defun hpath:display-buffer-function 1179,52615
+(defun hpath:display-path-function 1184,52871
+(defun hpath:resolve 1189,53122
+(defun hpath:expand 1211,54136
+(defun hpath:prepend-shell-directory 1240,55608
+(defvar hpath:compressed-suffix-regexp 1274,57406
+(defun hpath:expand-with-variable 1277,57562
+(defun hpath:file-line-and-column 1315,59281
+(defun hpath:find-noselect 1333,60158
+(defun hpath:find 1342,60507
+(defun hpath:to-markup-anchor 1507,67492
+(defun hpath:find-executable 1572,70307
+(defun hpath:find-line 1587,70811
+(defun hpath:find-other-frame 1607,71581
+(defun hpath:find-other-window 1622,72059
+(defun hpath:get-external-display-alist 1632,72554
+(defun hpath:is-p 1651,73543
+(defun hpath:push-tag-mark 1753,78383
+(defun hpath:relative-arguments 1767,78895
+(defun hpath:relative-to 1777,79325
+(defun hpath:rfc 1809,80613
+(defun hpath:start-end 1814,80786
+(defun hpath:return-one-value 1843,81990
+(defun hpath:substitute-value 1881,83671
+(defun hpath:substitute-var 1925,85326
+(defun hpath:symlink-referent 1963,86792
+(defun hpath:symlink-expand 1978,87387
+(defun hpath:to-line 2013,89026
+(defun hpath:trim 2022,89313
+(defun hpath:normalize 2031,89651
+(defun hpath:validate 2039,90037
+(defun hpath:find-file-urls-p 2062,90944
+(defun hpath:handle-urls 2068,91203
+(defalias 
'hyperb:substitute-in-file-namehyperb:substitute-in-file-name2085,91945
+(defun substitute-in-file-name 2088,92036
+(defun hpath:enable-find-file-urls 2101,92678
+(defun hpath:disable-find-file-urls 2132,93808
+(defun hpath:find-file-urls-mode 2161,94843
+(defun hpath:url-at-p 2173,95330
+(defun hpath:url-p 2184,95821
+(defun hpath:www-at-p 2195,96216
+(defun hpath:www-p 2211,96913
+(defun hpath:command-string 2219,97236
+(defun hpath:display-where-function 2228,97643
+(defun hpath:remote-available-p 2238,98113
+(defun hpath:remote-default-user 2257,98960
+(defun hpath:delete-trailer 2271,99416
+(defun hpath:exists-p 2279,99700
+(defun hpath:find-file-mailcap 2310,100697
+(defun hpath:find-program 2326,101213
+(defun hpath:match 2347,102084
+(defun hpath:get-single-string-variable-value 2361,102684
+(defun hpath:substitute-dir 2391,103778
+(defun hpath:substitute-match-value 2457,106861
+(defun hpath:substitute-var-name 2519,109077
 
 hrmail.el,723
 (defun Rmail-init 47,1512
@@ -954,30 +958,30 @@ hsys-org.el,1411
 (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
+(defun hsys-org-get-value 160,6518
+(defun hsys-org-global-cycle 169,6883
+(defun hsys-org-todo-cycle 176,7105
+(defun hsys-org-todo-set-cycle 181,7257
+(defun hsys-org-todo-occur 187,7463
+(defun hsys-org-region-with-text-property-value 198,7953
+(defun hsys-org-agenda-item-at-p 213,8681
+(defun hsys-org-block-start-at-p 218,8866
+(defun hsys-org-src-block-start-at-p 226,9131
+(defun hsys-org-link-at-p 246,9949
+(defun hsys-org-heading-at-p 255,10361
+(defun hsys-org-target-at-p 261,10586
+(defun hsys-org-todo-at-p 269,10963
+(defun hsys-org-radio-target-link-at-p 275,11181
+(defun hsys-org-radio-target-def-at-p 282,11541
+(defun hsys-org-radio-target-at-p 294,12076
+(defun hsys-org-internal-target-link-at-p 301,12403
+(defun hsys-org-internal-target-def-at-p 309,12803
+(defun hsys-org-internal-target-at-p 321,13333
+(defun hsys-org-face-at-p 328,13671
+(defun hsys-org-search-internal-link-p 338,14056
+(defun hsys-org-search-radio-target-link-p 360,14906
+(defun hsys-org-set-ibut-label 379,15622
+(defun hsys-org-to-next-radio-target-link 387,15951
 
 hsys-org-roam.el,43
 (defun hsys-org-roam-consult-grep 39,1257
@@ -1030,154 +1034,154 @@ htz.el,628
 (defvar htz:months-assoc402,15818
 
 hycontrol.el,7134
-(defvar hycontrol-debug 148,7014
-(defvar hycontrol-display-buffer-predicate-list151,7119
-(defcustom hycontrol-help-flag 163,7649
-(defcustom hycontrol-invert-mode-line-flag 168,7813
-(defcustom hycontrol-keep-window-flag 173,7989
-(defcustom hycontrol-maximum-units 178,8157
-(defcustom hycontrol-frame-offset 187,8508
-(defvar hycontrol-screen-offset-alist193,8749
-(defcustom hycontrol-screen-top-offset 210,9525
-(defcustom hycontrol-screen-right-offset 216,9797
-(defcustom hycontrol-screen-bottom-offset 222,10072
-(defcustom hycontrol-screen-left-offset 228,10350
-(defvar hycontrol-frame-widths235,10624
-(defvar hycontrol-frame-heights240,10821
-(defvar hycontrol-arg 245,11019
-(defvar hycontrol-frames-mode-map255,11399
-(defvar hycontrol-windows-mode-map363,18929
-(defvar hycontrol--frames-prompt-format470,25950
-(defvar hycontrol--windows-prompt-format480,26798
-(defvar hycontrol--prompt-format 490,27537
-(defvar hycontrol--exit-status 493,27648
-(defvar hycontrol--fconfig 499,27873
-(defvar hycontrol--wconfig 502,27966
-(defvar hycontrol--invert-display-buffer-predicates 506,28061
-(defvar hycontrol--quit-function 509,28120
-(defvar hycontrol--screen-edge-position 514,28278
-(defvar hycontrol--frame-widths-pointer 518,28452
-(defvar hycontrol--frame-heights-pointer 519,28497
-(defvar hycontrol--buffer-list 520,28543
-(defvar hycontrol--buffer-list-pointer 521,28579
-(defvar hycontrol--initial-which-key-inhibit 523,28624
-(defsubst hycontrol-windows-grid-valid-size-p 531,28960
-(defun hycontrol-pre-command-hook 539,29241
-(defun hycontrol-post-command-hook 544,29428
-(defun hycontrol-end-mode 557,30060
-(defun hycontrol-stay-in-mode 577,30747
-(defun hycontrol-invert-prefix-arg 582,30874
-(defun hycontrol-minus-key 589,31142
-(defun hycontrol-multiply-universal-arg 600,31581
-(defun hycontrol-reset-prefix-arg 609,31944
-(defun hycontrol-universal-arg-digit 615,32099
-(defun hycontrol-setup 635,32676
-(defun hycontrol-frames-setup 661,33735
-(defun hycontrol-frames 670,34114
-(defun hycontrol-windows-setup 681,34634
-(defun hycontrol-windows 690,35017
-(defsubst hycontrol-frame-edges 704,35584
-(defsubst hycontrol-frame-x-origin 713,36043
-(defsubst hycontrol-frame-y-origin 720,36405
-(defun hycontrol-frame-height 727,36767
-(defun hycontrol-frame-width 734,37050
-(defconst hycontrol-screen-offset-sensitivity 742,37356
-(defun hycontrol-frame-at-left-p 747,37559
-(defun hycontrol-frame-at-top-p 753,37858
-(defun hycontrol-frame-at-right-p 762,38300
-(defun hycontrol-frame-at-bottom-p 768,38627
-(defun hycontrol-frame-zoom 778,39135
-(defun hycontrol-make-frame 788,39574
-(defun hycontrol-move-frame 797,40062
-(defun hycontrol-numeric-keypad 806,40410
-(defun hycontrol-set-frame-height 817,40951
-(defun hycontrol-set-frame-position 831,41651
-(defun hycontrol-set-frame-size 843,42273
-(defun hycontrol-set-frame-width 858,42991
-(defun hycontrol-display-buffer-predicate-results 875,43781
-(defvar hycontrol--blank-buffer 885,44144
-(defun hycontrol-window-display-buffer 889,44310
-(defun hycontrol-window-display-buffer-with-repeats 918,45750
-(defun hycontrol-message 952,47617
-(defun hycontrol-user-error 957,47797
-(defun hycontrol-enable-frames-mode 971,48241
-(defun hycontrol-enable-windows-mode 983,48758
-(defun hycontrol-disable-modes 995,49305
-(defun hycontrol-abort 1003,49568
-(defun hycontrol-quit 1009,49710
-(define-minor-mode hycontrol-local-frames-mode1029,50538
-(define-global-minor-mode hycontrol-frames-mode 1035,50719
-(define-minor-mode hycontrol-local-windows-mode1050,51329
-(define-global-minor-mode hycontrol-windows-mode 1056,51512
-(defun hycontrol-delete-other-frames 1068,51980
-(defun hycontrol-frame-swap-buffers 1074,52194
-(defconst hycontrol--vnk-string1098,52989
-(defun hycontrol-virtual-numeric-keypad 1104,53215
-(defun hycontrol-frame-to-screen-edges 1113,53511
-(defun hycontrol-frame-to-bottom 1130,54349
-(defun hycontrol-frame-to-left 1139,54653
-(defun hycontrol-frame-to-right 1145,54887
-(defun hycontrol-frame-fit-to-screen 1154,55183
-(defun hycontrol-frame-to-top 1185,57231
-(defun hycontrol-frame-to-bottom-center 1191,57462
-(defun hycontrol-frame-to-center 1200,57828
-(defun hycontrol-frame-to-left-center 1209,58116
-(defun hycontrol-frame-to-right-center 1216,58417
-(defun hycontrol-frame-to-top-center 1225,58777
-(defun hycontrol-frame-to-bottom-left 1231,59070
-(defun hycontrol-frame-to-bottom-right 1240,59393
-(defun hycontrol-frame-to-top-left 1251,59782
-(defun hycontrol-frame-to-top-right 1257,60029
-(defun hycontrol-frame-resize-percentage 1267,60366
-(defun hycontrol-frame-resize-arg 1283,61030
-(defun hycontrol-frame-resize-to-bottom 1294,61350
-(defun hycontrol-frame-resize-to-left 1313,62248
-(defun hycontrol-frame-resize-to-right 1332,63151
-(defun hycontrol-frame-resize-to-top 1352,64059
-(defun hycontrol-frame-minimize-lines 1370,64897
-(defun hycontrol-frame-percentage-of-screen 1382,65321
-(defun hycontrol-frame-height-percentage-of-screen 1435,67615
-(defun hycontrol-frame-width-percentage-of-screen 1440,67899
-(defun hycontrol-set-width-percentage-full-height 1447,68209
-(defun hycontrol-set-height-percentage-full-width 1451,68394
-(defun hycontrol-frame-adjust-widths 1456,68596
-(defun hycontrol-frame-adjust-widths-full-height 1473,69400
-(defun hycontrol-frame-adjust-heights 1488,70086
-(defun hycontrol-frame-adjust-heights-full-width 1506,70905
-(defun hycontrol-framemove-direction 1521,71612
-(defun hycontrol-framemove-up 1525,71727
-(defun hycontrol-framemove-left 1530,71869
-(defun hycontrol-framemove-right 1535,72024
-(defun hycontrol-framemove-down 1540,72182
-(defun hycontrol-restore-frame-configuration 1547,72353
-(defun hycontrol-save-frame-configuration 1553,72599
-(defun hycontrol-save-configurations 1559,72841
-(defun hycontrol-invert-mode-line 1567,73000
-(defun hycontrol-windows-grid-marked-items 1577,73418
-(defun hycontrol-windows-grid-buffer-list 1594,74171
-(defun hycontrol-windows-grid 1610,74894
-(defun hycontrol-windows-grid-validate 1669,77642
-(defun hycontrol-windows-grid-number-of-windows 1686,78321
-(defun hycontrol-windows-grid-minimum-size 1702,78973
-(defun hycontrol-windows-grid-by-buffer-list 1716,79672
-(defun hycontrol-windows-grid-by-file-list 1727,80210
-(defun hycontrol-windows-grid-by-file-pattern 1739,80755
-(defun hycontrol-windows-grid-by-major-mode 1771,82210
-(defun hycontrol-windows-grid-repeatedly 1788,83061
-(defun hycontrol-make-windows-grid 1808,83888
-(defun hycontrol-delete-other-windows 1907,88167
-(defun hycontrol-window-maximize-lines 1913,88406
-(defun hycontrol-window-minimize-lines 1918,88568
-(defun hycontrol-window-swap-buffers 1932,89215
-(defun hycontrol-window-to-new-frame 1950,89847
-(defun hycontrol-clone-window-to-new-frame 1978,91020
-(defun hycontrol-restore-window-configuration 1984,91241
-(defun hycontrol-save-window-configuration 1990,91486
-(defun hycontrol-display-screen-offsets 1997,91838
-(defun hycontrol-get-screen-offsets 2006,92195
-(defun hycontrol-set-screen-offsets 2039,93493
-(defun hycontrol-help-key-description 2054,94104
-(defun hycontrol-toggle-help 2058,94297
+(defvar hycontrol-debug 150,7051
+(defvar hycontrol-display-buffer-predicate-list153,7156
+(defcustom hycontrol-help-flag 165,7686
+(defcustom hycontrol-invert-mode-line-flag 170,7850
+(defcustom hycontrol-keep-window-flag 175,8026
+(defcustom hycontrol-maximum-units 180,8194
+(defcustom hycontrol-frame-offset 189,8545
+(defvar hycontrol-screen-offset-alist195,8786
+(defcustom hycontrol-screen-top-offset 212,9562
+(defcustom hycontrol-screen-right-offset 218,9834
+(defcustom hycontrol-screen-bottom-offset 224,10109
+(defcustom hycontrol-screen-left-offset 230,10387
+(defvar hycontrol-frame-widths237,10661
+(defvar hycontrol-frame-heights242,10858
+(defvar hycontrol-arg 247,11056
+(defvar hycontrol-frames-mode-map257,11436
+(defvar hycontrol-windows-mode-map365,18952
+(defvar hycontrol--frames-prompt-format472,25969
+(defvar hycontrol--windows-prompt-format482,26817
+(defvar hycontrol--prompt-format 492,27556
+(defvar hycontrol--exit-status 495,27667
+(defvar hycontrol--fconfig 501,27892
+(defvar hycontrol--wconfig 504,27985
+(defvar hycontrol--invert-display-buffer-predicates 508,28080
+(defvar hycontrol--quit-function 511,28139
+(defvar hycontrol--screen-edge-position 516,28297
+(defvar hycontrol--frame-widths-pointer 520,28471
+(defvar hycontrol--frame-heights-pointer 521,28516
+(defvar hycontrol--buffer-list 522,28562
+(defvar hycontrol--buffer-list-pointer 523,28598
+(defvar hycontrol--initial-which-key-inhibit 525,28643
+(defsubst hycontrol-windows-grid-valid-size-p 533,28979
+(defun hycontrol-pre-command-hook 541,29260
+(defun hycontrol-post-command-hook 546,29447
+(defun hycontrol-end-mode 559,30079
+(defun hycontrol-stay-in-mode 579,30766
+(defun hycontrol-invert-prefix-arg 584,30893
+(defun hycontrol-minus-key 591,31161
+(defun hycontrol-multiply-universal-arg 602,31600
+(defun hycontrol-reset-prefix-arg 611,31963
+(defun hycontrol-universal-arg-digit 617,32118
+(defun hycontrol-setup 637,32695
+(defun hycontrol-frames-setup 663,33754
+(defun hycontrol-frames 672,34133
+(defun hycontrol-windows-setup 683,34653
+(defun hycontrol-windows 692,35036
+(defsubst hycontrol-frame-edges 706,35603
+(defsubst hycontrol-frame-x-origin 715,36062
+(defsubst hycontrol-frame-y-origin 722,36424
+(defun hycontrol-frame-height 729,36786
+(defun hycontrol-frame-width 736,37069
+(defconst hycontrol-screen-offset-sensitivity 744,37375
+(defun hycontrol-frame-at-left-p 749,37578
+(defun hycontrol-frame-at-top-p 755,37877
+(defun hycontrol-frame-at-right-p 764,38319
+(defun hycontrol-frame-at-bottom-p 770,38646
+(defun hycontrol-frame-zoom 780,39154
+(defun hycontrol-make-frame 790,39593
+(defun hycontrol-move-frame 799,40081
+(defun hycontrol-numeric-keypad 808,40429
+(defun hycontrol-set-frame-height 819,40970
+(defun hycontrol-set-frame-position 833,41670
+(defun hycontrol-set-frame-size 845,42292
+(defun hycontrol-set-frame-width 860,43010
+(defun hycontrol-display-buffer-predicate-results 877,43800
+(defvar hycontrol--blank-buffer 887,44163
+(defun hycontrol-window-display-buffer 891,44329
+(defun hycontrol-window-display-buffer-with-repeats 920,45769
+(defun hycontrol-message 954,47636
+(defun hycontrol-user-error 959,47816
+(defun hycontrol-enable-frames-mode 973,48260
+(defun hycontrol-enable-windows-mode 985,48777
+(defun hycontrol-disable-modes 997,49324
+(defun hycontrol-abort 1005,49587
+(defun hycontrol-quit 1011,49729
+(define-minor-mode hycontrol-local-frames-mode1031,50557
+(define-global-minor-mode hycontrol-frames-mode 1037,50738
+(define-minor-mode hycontrol-local-windows-mode1052,51348
+(define-global-minor-mode hycontrol-windows-mode 1058,51531
+(defun hycontrol-delete-other-frames 1070,51999
+(defun hycontrol-frame-swap-buffers 1076,52213
+(defconst hycontrol--vnk-string1100,53008
+(defun hycontrol-virtual-numeric-keypad 1106,53234
+(defun hycontrol-frame-to-screen-edges 1115,53530
+(defun hycontrol-frame-to-bottom 1132,54368
+(defun hycontrol-frame-to-left 1141,54672
+(defun hycontrol-frame-to-right 1147,54906
+(defun hycontrol-frame-fit-to-screen 1156,55202
+(defun hycontrol-frame-to-top 1187,57250
+(defun hycontrol-frame-to-bottom-center 1193,57481
+(defun hycontrol-frame-to-center 1202,57847
+(defun hycontrol-frame-to-left-center 1211,58135
+(defun hycontrol-frame-to-right-center 1218,58436
+(defun hycontrol-frame-to-top-center 1227,58796
+(defun hycontrol-frame-to-bottom-left 1233,59089
+(defun hycontrol-frame-to-bottom-right 1242,59412
+(defun hycontrol-frame-to-top-left 1253,59801
+(defun hycontrol-frame-to-top-right 1259,60048
+(defun hycontrol-frame-resize-percentage 1269,60385
+(defun hycontrol-frame-resize-arg 1285,61049
+(defun hycontrol-frame-resize-to-bottom 1296,61369
+(defun hycontrol-frame-resize-to-left 1315,62267
+(defun hycontrol-frame-resize-to-right 1334,63170
+(defun hycontrol-frame-resize-to-top 1354,64078
+(defun hycontrol-frame-minimize-lines 1372,64916
+(defun hycontrol-frame-percentage-of-screen 1384,65340
+(defun hycontrol-frame-height-percentage-of-screen 1437,67634
+(defun hycontrol-frame-width-percentage-of-screen 1442,67918
+(defun hycontrol-set-width-percentage-full-height 1449,68228
+(defun hycontrol-set-height-percentage-full-width 1453,68413
+(defun hycontrol-frame-adjust-widths 1458,68615
+(defun hycontrol-frame-adjust-widths-full-height 1475,69419
+(defun hycontrol-frame-adjust-heights 1490,70105
+(defun hycontrol-frame-adjust-heights-full-width 1508,70924
+(defun hycontrol-framemove-direction 1523,71631
+(defun hycontrol-framemove-up 1527,71746
+(defun hycontrol-framemove-left 1532,71888
+(defun hycontrol-framemove-right 1537,72043
+(defun hycontrol-framemove-down 1542,72201
+(defun hycontrol-restore-frame-configuration 1549,72372
+(defun hycontrol-save-frame-configuration 1555,72618
+(defun hycontrol-save-configurations 1561,72860
+(defun hycontrol-invert-mode-line 1569,73019
+(defun hycontrol-windows-grid-marked-items 1579,73437
+(defun hycontrol-windows-grid-buffer-list 1596,74190
+(defun hycontrol-windows-grid 1612,74913
+(defun hycontrol-windows-grid-validate 1671,77661
+(defun hycontrol-windows-grid-number-of-windows 1688,78340
+(defun hycontrol-windows-grid-minimum-size 1704,78992
+(defun hycontrol-windows-grid-by-buffer-list 1718,79691
+(defun hycontrol-windows-grid-by-file-list 1729,80229
+(defun hycontrol-windows-grid-by-file-pattern 1741,80774
+(defun hycontrol-windows-grid-by-major-mode 1773,82229
+(defun hycontrol-windows-grid-repeatedly 1790,83080
+(defun hycontrol-make-windows-grid 1810,83907
+(defun hycontrol-delete-other-windows 1909,88186
+(defun hycontrol-window-maximize-lines 1915,88425
+(defun hycontrol-window-minimize-lines 1920,88587
+(defun hycontrol-window-swap-buffers 1934,89234
+(defun hycontrol-window-to-new-frame 1952,89866
+(defun hycontrol-clone-window-to-new-frame 1980,91039
+(defun hycontrol-restore-window-configuration 1986,91260
+(defun hycontrol-save-window-configuration 1992,91505
+(defun hycontrol-display-screen-offsets 1999,91857
+(defun hycontrol-get-screen-offsets 2008,92214
+(defun hycontrol-set-screen-offsets 2041,93512
+(defun hycontrol-help-key-description 2056,94123
+(defun hycontrol-toggle-help 2060,94316
 
 hui-jmenu.el,1044
 (defun hui-menu-of-buffers 46,1717
@@ -1221,8 +1225,8 @@ hui-menu.el,638
 (defun hyperbole-menubar-menu 283,10988
 (defun hyperbole-popup-menu 306,12009
 (defun infodock-hyperbole-menu 313,12277
-(defvar hui-menu-max-list-length 483,18934
-(defvar hui-menu-order-explicit-buttons 486,19049
+(defvar hui-menu-max-list-length 484,18976
+(defvar hui-menu-order-explicit-buttons 487,19091
 
 hui-mini.el,1484
 (defvar hui:menu-exit-hyperbole 30,929
@@ -1253,100 +1257,100 @@ hui-mini.el,1484
 (defun hui:menu-item-key 356,13719
 (defun hui:menu-item-keys 371,14279
 (defun hui:menu-choose 378,14600
-(defun hui:menu-to-personal-section 461,17902
-(defun hui:bottom-window 475,18566
-(defun hui:menu-item 485,18895
-(defun hui:menu-line 528,20903
-(defun hui:menu-multi-line 543,21538
-(defun hui:menu-name-at-p 569,22406
-(defun hui:menu-web-search 574,22663
-(defun hui-search-web 595,23280
-(defvar hui:menu-mode-map 617,24139
-(defun hyperbole-minibuffer-menu 645,25578
-(defcustom hui:menu-rolo923,41279
-(defcustom hui:menu-to953,43110
-(defcustom hui:doc-a-z992,44613
-
-hui-mouse.el,3113
-(defvar hmouse-set-point-command 74,2760
-(defun action-key-error 77,2858
-(defun assist-key-error 85,3208
-(defcustom action-key-default-function 93,3559
-(defcustom assist-key-default-function 99,3804
-(defcustom action-key-modeline-buffer-id-function 106,4056
-(defcustom action-key-eol-function 113,4369
-(defcustom assist-key-eol-function 120,4604
-(defvar hkey-value 194,7730
-(defvar hkey-alist197,7827
-(defvar hmouse-alist 533,21225
-(defun first-line-p 567,22557
-(defun last-line-p 571,22689
-(defun smart-completion-help 575,22819
-(defun smart-buffer-menu-no-marks 584,23217
-(defun smart-buffer-menu 597,23689
-(defun smart-buffer-menu-assist 626,24759
-(defun smart-ibuffer-menu-no-marks 654,25853
-(defun smart-ibuffer-menu 667,26328
-(defun smart-ibuffer-menu-assist 694,27339
-(defun smart-custom 724,28512
-(defun smart-custom-assist 745,29357
-(defun smart-calendar 773,30407
-(defun smart-calendar-assist 794,31230
-(defun smart-company-to-definition 823,32433
-(defun smart-company-help 831,32752
-(defun smart-dired-pathname-up-to-point 844,33248
-(defun smart-dired 861,33814
-(defun smart-dired-assist 906,35738
-(defun smart-gnus-group 939,37017
-(defun smart-gnus-group-assist 961,37936
-(defun smart-gnus-summary 983,38914
-(defun smart-gnus-summary-assist 1013,40171
-(defun smart-gnus-article 1035,41117
-(defun smart-gnus-article-assist 1058,42121
-(defun smart-helm-at-header 1086,43341
-(defun smart-helm-get-current-action 1095,43682
-(defun smart-helm-line-has-action 1105,44163
-(defun smart-helm-alive-p 1123,44954
-(defun smart-helm-resume-helm 1131,45260
-(defun smart-helm-at 1140,45595
-(defun smart-helm-to-minibuffer 1172,46712
-(defun smart-helm(1177,46871
-(defun smart-helm-assist(1228,49120
-(defun smart-hmail 1292,51911
-(defun smart-hmail-assist 1325,53121
-(defun smart-hyrolo 1363,54543
-(defalias 'smart-hyrolo-assist smart-hyrolo-assist1373,54886
-(defun smart-image-dired-thumbnail 1379,55121
-(defun smart-image-dired-thumbnail-assist 1384,55351
-(defun smart-imenu-display-item-where 1394,55807
-(defun smart-imenu-item-at-p 1400,56115
-(defun smart-imenu-item-p 1414,56868
-(defun smart-magit-display-file 1460,58953
-(defun smart-magit 1469,59365
-(defun smart-magit-assist 1494,60349
-(defun smart-magit-tab 1525,61659
-(defun smart-apropos 1561,63170
-(defun smart-apropos-assist 1581,63884
-(defun smart-man-display 1601,64661
-(defun smart-man-entry-ref 1605,64801
-(defun smart-man-c-routine-ref 1647,66323
-(defun smart-man-file-ref 1668,67182
-(defun smart-org 1692,67965
-(defvar smart-outline-cut 1849,73679
-(defun smart-outline-level 1861,74110
-(defun smart-outline 1870,74364
-(defun smart-outline-assist 1909,75751
-(defun smart-outline-to-entry-end 1945,77194
-(defun smart-outline-subtree-hidden-p 1955,77549
-(defun smart-outline-char-invisible-p 1961,77804
-(defun smart-todotxt 1977,78484
-(defun smart-todotxt-assist 1987,78763
-(defun smart-eobp 1998,79059
-(defun smart-eolp 2008,79423
-(defun smart-push-button 2021,80010
-(defun smart-push-button-help 2033,80628
-(defun smart-tar 2051,81377
-(defun smart-tar-assist 2076,82191
+(defun hui:menu-to-personal-section 460,17880
+(defun hui:bottom-window 474,18544
+(defun hui:menu-item 484,18873
+(defun hui:menu-line 527,20881
+(defun hui:menu-multi-line 542,21516
+(defun hui:menu-name-at-p 568,22384
+(defun hui:menu-web-search 573,22641
+(defun hui-search-web 594,23258
+(defvar hui:menu-mode-map 616,24117
+(defun hyperbole-minibuffer-menu 644,25556
+(defcustom hui:menu-rolo922,41359
+(defcustom hui:menu-to952,43190
+(defcustom hui:doc-a-z991,44693
+
+hui-mouse.el,3114
+(defvar hmouse-set-point-command 76,2791
+(defun action-key-error 79,2889
+(defun assist-key-error 87,3239
+(defcustom action-key-default-function 95,3590
+(defcustom assist-key-default-function 101,3835
+(defcustom action-key-modeline-buffer-id-function 108,4087
+(defcustom action-key-eol-function 115,4400
+(defcustom assist-key-eol-function 122,4635
+(defvar hkey-value 196,7761
+(defvar hkey-alist199,7858
+(defvar hmouse-alist 535,21315
+(defun first-line-p 569,22647
+(defun last-line-p 573,22779
+(defun smart-completion-help 577,22909
+(defun smart-buffer-menu-no-marks 586,23307
+(defun smart-buffer-menu 599,23779
+(defun smart-buffer-menu-assist 628,24849
+(defun smart-ibuffer-menu-no-marks 656,25943
+(defun smart-ibuffer-menu 669,26418
+(defun smart-ibuffer-menu-assist 696,27429
+(defun smart-custom 726,28602
+(defun smart-custom-assist 747,29447
+(defun smart-calendar 775,30497
+(defun smart-calendar-assist 796,31320
+(defun smart-company-to-definition 825,32523
+(defun smart-company-help 833,32842
+(defun smart-dired-pathname-up-to-point 846,33338
+(defun smart-dired 863,33904
+(defun smart-dired-assist 908,35828
+(defun smart-gnus-group 941,37107
+(defun smart-gnus-group-assist 963,38026
+(defun smart-gnus-summary 985,39004
+(defun smart-gnus-summary-assist 1015,40261
+(defun smart-gnus-article 1037,41207
+(defun smart-gnus-article-assist 1060,42211
+(defun smart-helm-at-header 1088,43431
+(defun smart-helm-get-current-action 1097,43772
+(defun smart-helm-line-has-action 1107,44253
+(defun smart-helm-alive-p 1125,45044
+(defun smart-helm-resume-helm 1133,45350
+(defun smart-helm-at 1142,45685
+(defun smart-helm-to-minibuffer 1174,46802
+(defun smart-helm(1179,46961
+(defun smart-helm-assist(1230,49210
+(defun smart-hmail 1294,52001
+(defun smart-hmail-assist 1327,53211
+(defun smart-hyrolo 1365,54633
+(defalias 'smart-hyrolo-assist smart-hyrolo-assist1375,54976
+(defun smart-image-dired-thumbnail 1381,55211
+(defun smart-image-dired-thumbnail-assist 1386,55441
+(defun smart-imenu-display-item-where 1396,55897
+(defun smart-imenu-item-at-p 1402,56205
+(defun smart-imenu-item-p 1416,56958
+(defun smart-magit-display-file 1464,59124
+(defun smart-magit 1473,59536
+(defun smart-magit-assist 1498,60520
+(defun smart-magit-tab 1529,61830
+(defun smart-apropos 1565,63341
+(defun smart-apropos-assist 1585,64055
+(defun smart-man-display 1605,64832
+(defun smart-man-entry-ref 1609,64972
+(defun smart-man-c-routine-ref 1651,66494
+(defun smart-man-file-ref 1672,67353
+(defun smart-org 1696,68136
+(defvar smart-outline-cut 1853,73850
+(defun smart-outline-level 1865,74281
+(defun smart-outline 1874,74535
+(defun smart-outline-assist 1913,75922
+(defun smart-outline-to-entry-end 1949,77365
+(defun smart-outline-subtree-hidden-p 1959,77720
+(defun smart-outline-char-invisible-p 1965,77975
+(defun smart-todotxt 1981,78655
+(defun smart-todotxt-assist 1991,78934
+(defun smart-eobp 2002,79230
+(defun smart-eolp 2012,79594
+(defun smart-push-button 2025,80181
+(defun smart-push-button-help 2037,80801
+(defun smart-tar 2055,81550
+(defun smart-tar-assist 2080,82364
 
 hui-select.el,2783
 (defcustom hui-select-brace-modes121,5691
@@ -1378,42 +1382,42 @@ hui-select.el,2783
 (defun hui-select-thing 411,18579
 (defun hui-select-thing-with-mouse 450,19997
 (defun hui-select-goto-matching-tag 473,21004
-(defun hui-select-and-copy-thing 579,24554
-(defun hui-select-and-kill-thing 587,24826
-(defun hui-select-boundaries 599,25083
-(defun hui-select-double-click-hook 660,27306
-(defun hui-select-syntactical-region 670,27785
-(defun hui-select-at-delimited-thing-p 702,29079
-(defun hui-select-delimited-thing 721,29909
-(defun hui-select-at-delimited-sexp-p 738,30526
-(defun hui-select-mark-delimited-sexp 746,30916
-(defun hui-select-at-blank-line-or-comment 774,31942
-(defun hui-select-back-to-indentation 796,32711
-(defun hui-select-bigger-thing 806,33130
-(defun hui-select-delimited-thing-call 812,33302
-(defun hui-select-region-bigger-p 834,34252
-(defun hui-select-reset 852,35097
-(defun hui-select-set-region 859,35301
-(defun hui-select-string-p 875,35956
-(defun hui-select-brace-def-or-declaration 922,37754
-(defun hui-select-indent-def 1023,41463
-(defun hui-select-symbol 1078,43582
-(defun hui-select-sexp-start 1094,44193
-(defun hui-select-sexp-end 1102,44491
-(defun hui-select-sexp 1109,44759
-(defun hui-select-sexp-up 1118,45049
-(defun hui-select-preprocessor-def 1130,45548
-(defun hui-select-punctuation 1155,46764
-(defun hui-select-comment 1173,47567
-(defun hui-select-word 1248,49863
-(defun hui-select-string 1260,50227
-(defun hui-select-sentence 1281,50957
-(defun hui-select-whitespace 1290,51248
-(defun hui-select-markup-pair 1306,51862
-(defun hui-select-line 1414,55900
-(defun hui-select-paragraph 1424,56243
-(defun hui-select-page 1434,56581
-(defun hui-select-buffer 1442,56835
+(defun hui-select-and-copy-thing 579,24555
+(defun hui-select-and-kill-thing 587,24827
+(defun hui-select-boundaries 599,25084
+(defun hui-select-double-click-hook 660,27307
+(defun hui-select-syntactical-region 670,27786
+(defun hui-select-at-delimited-thing-p 702,29080
+(defun hui-select-delimited-thing 721,29910
+(defun hui-select-at-delimited-sexp-p 738,30527
+(defun hui-select-mark-delimited-sexp 746,30917
+(defun hui-select-at-blank-line-or-comment 774,31943
+(defun hui-select-back-to-indentation 796,32712
+(defun hui-select-bigger-thing 806,33131
+(defun hui-select-delimited-thing-call 812,33303
+(defun hui-select-region-bigger-p 834,34253
+(defun hui-select-reset 852,35098
+(defun hui-select-set-region 859,35302
+(defun hui-select-string-p 875,35957
+(defun hui-select-brace-def-or-declaration 922,37755
+(defun hui-select-indent-def 1023,41464
+(defun hui-select-symbol 1078,43583
+(defun hui-select-sexp-start 1094,44194
+(defun hui-select-sexp-end 1102,44492
+(defun hui-select-sexp 1109,44760
+(defun hui-select-sexp-up 1118,45050
+(defun hui-select-preprocessor-def 1130,45549
+(defun hui-select-punctuation 1155,46765
+(defun hui-select-comment 1173,47568
+(defun hui-select-word 1248,49864
+(defun hui-select-string 1260,50228
+(defun hui-select-sentence 1281,50958
+(defun hui-select-whitespace 1290,51249
+(defun hui-select-markup-pair 1306,51863
+(defun hui-select-line 1414,55901
+(defun hui-select-paragraph 1424,56244
+(defun hui-select-page 1434,56582
+(defun hui-select-buffer 1442,56836
 
 hui-treemacs.el,72
 (defun smart-treemacs 62,2340
@@ -1498,7 +1502,7 @@ hui-window.el,3359
 (defun hmouse-x-coord 1223,53940
 (defun hmouse-y-coord 1247,54727
 
-hui.el,2299
+hui.el,2341
 (defcustom hui:hbut-delete-confirm-flag 39,1219
 (defcustom hui:ebut-prompt-for-action 44,1382
 (defun hui-copy-to-register 55,1804
@@ -1512,54 +1516,55 @@ hui.el,2299
 (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,27715
-(defun hui:hbut-buf 701,28088
-(defun hui:hbut-current-act 726,28850
-(defun hui:hbut-delete 736,29224
-(defun hui:hbut-help 776,30997
-(defun hui:hbut-label 817,32483
-(defun hui:hbut-label-default 828,32980
-(defun hui:hbut-rename 843,33715
-(defun hui:hbut-report 853,34071
-(defalias 'hui:hbut-summarize hui:hbut-summarize864,34423
-(defun hui:ibut-act 866,34473
-(defun hui:ibut-create 881,35044
-(defun hui:ibut-edit 914,36421
-(defun hui:ibut-label-create 984,39098
-(defun hui:ibut-rename 1022,40973
-(defun hui:ebut-link-directly 1056,42128
-(defun hui:ibut-link-directly 1139,45288
-(defun hui:action 1242,49371
-(defun hui:actype 1295,51104
-(defun hui:buf-writable-err 1314,52097
-(defvar hui:ignore-buffers-regexp 1334,52960
-(defun hui:ebut-delete-op 1337,53130
-(defun hui:ebut-message 1368,54383
-(defun hui:ebut-unmark 1379,54787
-(defun hui:file-find 1439,57250
-(defun hui:hbut-operate 1446,57520
-(defun hui:hbut-term-highlight 1471,58633
-(defun hui:hbut-term-unhighlight 1485,59035
-(defun hui:help-ebut-highlight 1494,59321
-(defun hui:htype-delete 1500,59569
-(defun hui:htype-help 1511,59976
-(defun hui:htype-help-current-window 1562,61744
-(defun hui:ibut-delete-op 1569,62109
-(defun hui:ibut-message 1593,63212
-(defun hui:key-dir 1604,63616
-(defun hui:key-src 1613,63964
-(defun hui:ebut-link-create 1622,64335
-(defun hui:ibut-link-create 1645,65534
-(defun hui:link-possible-types 1668,66726
-(defun hui:list-remove-text-properties 1801,72094
-(defvar hui:ebut-label-prev 1811,72484
+(defun hui:ebut-rename 410,16485
+(defun hui:ebut-search 472,19001
+(defun hui:gbut-create 508,20428
+(defun hui:gbut-delete 556,22330
+(defun hui:gbut-edit 571,22992
+(defun hui:gbut-link-directly 661,26487
+(defun hui:gbut-rename 692,27734
+(defun hui:gibut-create 704,28200
+(defun hui:hbut-act 732,29254
+(defun hui:hbut-buf 740,29625
+(defun hui:hbut-current-act 765,30387
+(defun hui:hbut-delete 775,30762
+(defun hui:hbut-help 817,32607
+(defun hui:hbut-label 858,34093
+(defun hui:hbut-label-default 870,34620
+(defun hui:hbut-rename 885,35355
+(defun hui:hbut-report 895,35711
+(defalias 'hui:hbut-summarize hui:hbut-summarize906,36063
+(defun hui:ibut-act 908,36113
+(defun hui:ibut-create 923,36684
+(defun hui:ibut-edit 970,38811
+(defun hui:ibut-label-create 1040,41488
+(defun hui:ibut-rename 1078,43363
+(defun hui:ebut-link-directly 1112,44518
+(defun hui:ibut-link-directly 1205,48074
+(defun hui:action 1311,52317
+(defun hui:actype 1362,54029
+(defun hui:buf-writable-err 1381,55022
+(defvar hui:ignore-buffers-regexp 1401,55885
+(defun hui:ebut-delete-op 1404,56055
+(defun hui:ebut-message 1435,57308
+(defun hui:ebut-unmark 1446,57712
+(defun hui:file-find 1506,60175
+(defun hui:hbut-operate 1513,60445
+(defun hui:hbut-term-highlight 1556,62470
+(defun hui:hbut-term-unhighlight 1570,62872
+(defun hui:help-ebut-highlight 1579,63158
+(defun hui:htype-delete 1585,63406
+(defun hui:htype-help 1596,63813
+(defun hui:htype-help-current-window 1647,65581
+(defun hui:ibut-delete-op 1654,65946
+(defun hui:ibut-message 1680,67097
+(defun hui:key-dir 1691,67501
+(defun hui:key-src 1700,67849
+(defun hui:ebut-link-create 1709,68220
+(defun hui:ibut-link-create 1732,69419
+(defun hui:link-possible-types 1759,70783
+(defun hui:list-remove-text-properties 1891,76045
+(defvar hui:ebut-label-prev 1901,76435
 
 hvar.el,272
 (defvar var::append-list 34,1095
@@ -1573,17 +1578,17 @@ hvar.el,272
 
 hversion.el,450
 (defconst hyperb:version 29,875
-(defvar hyperb:mouse-buttons32,961
-(defvar hyperb:automount-prefixes40,1250
-(defun hyperb:stack-frame 56,1894
-(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
+(defvar hyperb:mouse-buttons32,947
+(defvar hyperb:automount-prefixes40,1236
+(defun hyperb:path-being-loaded 55,1853
+(defun hyperb:stack-frame 83,2827
+(defun hyperb:window-sys-term 123,4371
+(defun hyperb:window-system 145,5335
+(defalias 'id-browse-file id-browse-file165,6245
+(defun id-info 168,6312
+(defun id-info-item 184,6926
+(defalias 'id-tool-quit id-tool-quit212,8176
+(defun id-tool-invoke 215,8246
 
 hvm.el,874
 (defvar vm-edit-message-mode 55,1694
@@ -1617,92 +1622,91 @@ hypb.el,2611
 (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:count-visible-windows 254,10053
-(defun hypb:configuration 259,10273
-(defun hypb:debug 306,12685
-(defun hypb:decode-url 321,13202
-(defun hypb:def-to-buffer 348,14358
-(defun hypb:devdocs-lookup 364,14949
-(defun hypb:domain-name 372,15229
-(defun hypb:error 402,16487
-(defun hypb:fgrep-git-log 411,16776
-(defun hypb:fgrep-git-log-activate 419,17183
-(define-derived-mode hypb:fgrep-git-log-mode 426,17460
-(defun hypb:file-major-mode 432,17807
-(defun hypb:filter-directories 442,18199
-(defun hypb:format-args 457,18860
-(defun hypb:format-quote 461,19042
-(defun hypb:get-completion 475,19516
-(defun hypb:get-raw-syntax-descriptor 498,20556
-(defun hypb:glob-to-regexp 503,20775
-(defun hypb:goto-marker 514,21233
-(defun hypb:grep-git-log 532,21874
-(defun hypb:help-buf-name 539,22249
-(defun hypb:helm-apropos 548,22620
-(defun hypb:helm-info 557,22964
-(defun hypb:hkey-help-file 565,23283
-(defun hypb:indirect-function 579,23836
-(defun hypb:insert-region 593,24388
-(defun hypb:installation-type 609,25144
-(defun hypb:locate 651,27267
-(defun hypb:map-plist 683,28650
-(defun hypb:map-vector 689,28869
-(defun hypb:mark-object 702,29355
-(defun hypb:maximize-window-height 712,29744
-(defun hypb:object-p 725,30225
-(defun hypb:readable-directories 732,30475
-(defun hypb:require-package 742,30911
-(defun hypb:remove-lines 755,31505
-(defun hypb:return-process-output 761,31735
-(defun hypb:rgrep 780,32442
-(defun hypb:save-lines 817,34155
-(defmacro hypb:save-selected-window-and-input-focus 823,34383
-(defun hypb:select-window-frame 830,34712
-(defun hypb:set-raw-syntax-descriptor 837,35028
-(defun hypb:straight-package-plist 851,35629
-(defun hypb:string-count-matches 861,36153
-(defun hypb:supercite-p 889,37161
-(defun hypb:toggle-isearch-invisible 903,37612
-(defun hypb:uuid 923,38536
-(defun hypb:user-name 947,39125
-(defun hypb:window-list 953,39350
-(defvar hypb:home-page 964,39922
-(defvar hypb:hyperbole-banner-keymap967,40026
-(defun hypb:display-file-with-logo 976,40342
-(defun hypb:browse-home-page 998,41338
-(defun hypb:insert-hyperbole-banner 1008,41663
-(defun hypb:locate-pathnames 1039,43081
-(defun hypb:oct-to-int 1047,43386
-(define-button-type 'hyperbole-banner)hyperbole-banner1064,43967
-
-hyperbole.el,821
-(defconst hyperbole-loading 81,3564
-(defgroup hyperbole 87,3763
-(defgroup hyperbole-buttons 91,3851
-(defgroup hyperbole-commands 95,3972
-(defgroup hyperbole-keys 99,4065
-(defgroup hyperbole-screen 105,4216
-(defgroup hyperbole-koutliner 129,5209
-(defvar hyperbole-mode-map 133,5329
-(defcustom hyperbole-mode-lighter 137,5454
-(define-minor-mode hyperbole-mode144,5676
-(defvar hyperbole--mark-even-if-inactive164,6254
-(defcustom hkey-init 181,6993
-(defun hkey-get-bindings 196,7644
-(defun hkey-global-set-key 202,7876
-(defun hkey-maybe-global-set-key 207,8139
-(defun hkey-maybe-set-key 212,8358
-(defun hkey-set-key 221,8792
-(defun hkey-initialize 240,9520
-(defconst hyperb:cygdrive 450,18754
-(defun hyperb:init 452,18807
-(defun hyperbole--enable-mode 492,20183
-(defun hyperbole--disable-mode 522,21349
+(defun hypb:call-process-p 186,7435
+(defun hypb:char-count 208,8270
+(defun hypb:chmod 216,8500
+(defun hypb:cmd-key-series 226,8934
+(defun hypb:cmd-key-vector 244,9668
+(defun hypb:count-visible-windows 254,10058
+(defun hypb:configuration 259,10278
+(defun hypb:debug 306,12701
+(defun hypb:decode-url 321,13218
+(defun hypb:def-to-buffer 348,14374
+(defun hypb:devdocs-lookup 364,14965
+(defun hypb:domain-name 372,15245
+(defun hypb:error 402,16503
+(defun hypb:fgrep-git-log 411,16792
+(defun hypb:fgrep-git-log-activate 419,17199
+(define-derived-mode hypb:fgrep-git-log-mode 426,17476
+(defun hypb:file-major-mode 432,17823
+(defun hypb:filter-directories 442,18215
+(defun hypb:format-args 457,18876
+(defun hypb:format-quote 461,19058
+(defun hypb:get-completion 475,19532
+(defun hypb:get-raw-syntax-descriptor 498,20572
+(defun hypb:glob-to-regexp 503,20791
+(defun hypb:goto-marker 514,21249
+(defun hypb:grep-git-log 532,21890
+(defun hypb:help-buf-name 539,22265
+(defun hypb:helm-apropos 548,22636
+(defun hypb:helm-info 557,22980
+(defun hypb:hkey-help-file 565,23299
+(defun hypb:indirect-function 579,23852
+(defun hypb:insert-region 593,24404
+(defun hypb:installation-type 609,25160
+(defun hypb:locate 651,27283
+(defun hypb:map-plist 683,28666
+(defun hypb:map-vector 689,28885
+(defun hypb:mark-object 702,29371
+(defun hypb:maximize-window-height 712,29760
+(defun hypb:object-p 725,30241
+(defun hypb:readable-directories 732,30491
+(defun hypb:require-package 742,30927
+(defun hypb:remove-lines 755,31521
+(defun hypb:return-process-output 761,31751
+(defun hypb:rgrep 780,32458
+(defun hypb:save-lines 817,34171
+(defmacro hypb:save-selected-window-and-input-focus 823,34399
+(defun hypb:select-window-frame 830,34728
+(defun hypb:set-raw-syntax-descriptor 837,35044
+(defun hypb:straight-package-plist 851,35645
+(defun hypb:string-count-matches 861,36169
+(defun hypb:supercite-p 889,37177
+(defun hypb:toggle-isearch-invisible 903,37628
+(defun hypb:uuid 923,38552
+(defun hypb:user-name 947,39141
+(defun hypb:window-list 953,39366
+(defvar hypb:home-page 964,39938
+(defvar hypb:hyperbole-banner-keymap967,40042
+(defun hypb:display-file-with-logo 976,40358
+(defun hypb:browse-home-page 998,41354
+(defun hypb:insert-hyperbole-banner 1008,41679
+(defun hypb:locate-pathnames 1039,43097
+(defun hypb:oct-to-int 1047,43402
+(define-button-type 'hyperbole-banner)hyperbole-banner1064,43983
+
+hyperbole.el,784
+(defconst hyperbole-loading 81,3532
+(defgroup hyperbole 87,3731
+(defgroup hyperbole-commands 93,3872
+(defgroup hyperbole-keys 97,3965
+(defgroup hyperbole-screen 103,4116
+(defgroup hyperbole-koutliner 127,5109
+(defvar hyperbole-mode-map 131,5229
+(defcustom hyperbole-mode-lighter 135,5354
+(define-minor-mode hyperbole-mode142,5576
+(defvar hyperbole--mark-even-if-inactive160,6102
+(defcustom hkey-init 183,7073
+(defun hkey-get-bindings 198,7724
+(defun hkey-global-set-key 205,7987
+(defun hkey-maybe-global-set-key 210,8250
+(defun hkey-maybe-set-key 215,8469
+(defun hkey-set-key 224,8903
+(defun hkey-initialize 243,9631
+(defconst hyperb:cygdrive 453,18865
+(defun hyperb:init 455,18918
+(defun hyperbole--enable-mode 502,20650
+(defun hyperbole--disable-mode 532,21816
 
 hyrolo-demo.el,146
 (defvar hyrolo-demo-save-key 29,828
@@ -1732,124 +1736,127 @@ hyrolo-menu.el,191
 (defun hyrolo-menubar-menu 101,4375
 (defun hyrolo-popup-menu 110,4770
 
-hyrolo.el,4868
-(defgroup hyperbole-rolo 69,2525
-(defcustom hyrolo-date-format 73,2640
-(defvar hyrolo-display-format-function80,2890
-(defcustom hyrolo-email-format 86,3132
-(defvar hyrolo-entry-name-regexp 93,3420
-(defcustom hyrolo-file-suffix-regexp 96,3584
-(defcustom hyrolo-find-file-function 101,3765
-(defcustom hyrolo-find-file-noselect-function 107,4009
-(defcustom hyrolo-google-contacts-flag 112,4195
-(defvar hyrolo-next-match-function 119,4462
-(defun hyrolo-google-contacts-p 147,5732
-(defun hyrolo-initialize-file-list 161,6278
-(define-obsolete-variable-alias 'rolo-file-list rolo-file-list180,7090
-(defcustom hyrolo-file-list 181,7165
-(defcustom hyrolo-highlight-face 194,7634
-(defcustom hyrolo-kill-buffers-after-use 200,7806
-(defcustom hyrolo-save-buffers-after-use 206,8007
-(defvar hyrolo-yank-reformat-function 215,8323
-(defun hyrolo-add 225,8761
-(defun hyrolo-display-matches 356,13860
-(defun hyrolo-edit 388,15162
-(defun hyrolo-edit-entry 434,17080
-(defun hyrolo-fgrep 456,18058
-(defun hyrolo-find-file 494,19996
-(defun hyrolo-find-file-noselect 518,20945
-(defun hyrolo-forward-visible-line 527,21345
-(defun hyrolo-grep 537,21675
-(defun hyrolo-grep-or-fgrep 615,25326
-(defun hyrolo-hide-subtree 621,25603
-(defun hyrolo-isearch 635,26068
-(defun hyrolo-isearch-regexp 651,26780
-(defun hyrolo-verify 661,27170
-(defun hyrolo-kill 674,27730
-(defun hyrolo-locate 727,29714
-(defun hyrolo-mail-to 732,29891
-(defun hyrolo-next-match 745,30358
-(defun hyrolo-overview 763,31101
-(defun hyrolo-previous-match 779,31752
-(defun hyrolo-prompt 792,32333
-(defun hyrolo-quit 796,32477
-(defun hyrolo-rename 804,32739
-(defun hyrolo-set-display-buffer 831,33858
-(defun hyrolo-sort 838,34070
-(defun hyrolo-sort-level 880,35699
-(defun hyrolo-sort-lines 903,36881
-(defun hyrolo-toggle-datestamps 920,37605
-(defun hyrolo-toggle-narrow-to-entry 935,38334
-(defun hyrolo-top-level 949,38813
-(defun hyrolo-widen 958,39072
-(defun hyrolo-word 964,39258
-(defun hyrolo-yank 990,40578
-(defun hyrolo-bbdb-fgrep 1012,41419
-(defun hyrolo-bbdb-grep 1019,41675
-(defun hyrolo-bbdb-grep-file 1047,42824
-(defun hyrolo-bbdb-entry-format 1062,43653
-(defun hyrolo-google-contacts-fgrep 1071,43992
-(defun hyrolo-google-contacts-grep 1078,44282
-(defun hyrolo-google-contacts-grep-file 1103,45277
-(defun hyrolo-google-contacts-insert-data 1116,46074
-(defun hyrolo-google-contacts-insert-generic-list 1211,51863
-(defun hyrolo-retrieve-google-contacts 1226,52464
-(defun hyrolo-helm-org-rifle 1250,53537
-(defun hyrolo-helm-org-rifle-directory 1273,54501
-(defun hyrolo-helm-org-rifle-directories 1292,55281
-(defun hyrolo-org 1302,55783
-(defun hyrolo-org-roam 1316,56413
-(defun hyrolo-back-to-visible-point 1339,57403
-(defun hyrolo-backward-same-level 1347,57765
-(defun hyrolo-consult-grep 1354,58033
-(defun hyrolo-fgrep-directories 1390,59629
-(defun hyrolo-fgrep-file 1394,59840
-(defun hyrolo-forward-same-level 1408,60552
-(defun hyrolo-grep-directories 1415,60816
-(defun hyrolo-next-regexp-match 1419,61017
-(defun hyrolo-grep-file 1426,61278
-(defun hyrolo-map-level 1526,65180
-(defun hyrolo-map-single-subtree 1563,66958
-(defun hyrolo-mode 1592,67993
-(defun hyrolo-next-visible-heading 1615,68793
-(defun hyrolo-previous-visible-heading 1623,69091
-(defun hyrolo-to 1631,69393
-(defun hyrolo-to-entry-beginning 1683,71501
-(defun hyrolo-to-entry-end 1698,72079
-(defun hyrolo-up-heading 1723,72901
-(defun hyrolo-add-match 1734,73391
-(defun hyrolo-buffer-exists-p 1746,73935
-(defun hyrolo-current-date 1754,74217
-(defun hyrolo-display-to-entry-end 1758,74371
-(defun hyrolo-format-name 1767,74655
-(defun hyrolo-get-consult-version 1774,74969
-(defun hyrolo-highlight-matches 1785,75437
-(defun hyrolo-isearch-for-regexp 1796,75840
-(defun hyrolo-kill-buffer 1807,76332
-(defun hyrolo-name-and-email 1814,76654
-(defun hyrolo-name-at 1849,77849
-(defun hyrolo-save-buffer 1862,78333
-(defun hyrolo-set-date 1870,78718
-(defun hyrolo-min-matched-level 1889,79437
-(defun hyrolo-search-directories 1897,79735
-(defun hyrolo-show-levels 1904,80092
-(defun hyrolo-shrink-window 1941,81496
-(defun hyrolo-to-buffer 1954,81941
-(defun hyrolo-move-backward 1958,82073
-(defun hyrolo-move-forward 1970,82517
-(defun hyrolo-mode-outline-level 1985,82975
-(define-obsolete-variable-alias 'rolo-display-buffer 
rolo-display-buffer2006,83849
-(defvar hyrolo-display-buffer 2007,83934
-(defvar hyrolo-entry-group-number 2010,84039
-(defvar hyrolo-entry-trailing-space-group-number 2014,84176
-(define-obsolete-variable-alias 'rolo-entry-regexp 
rolo-entry-regexp2017,84302
-(defvar hyrolo-entry-regexp 2018,84383
-(defconst hyrolo-hdr-format2037,85221
-(defconst hyrolo-hdr-regexp 2045,85580
-(defconst hyrolo-match-regexp 2050,85791
-(defvar hyrolo--wconfig 2055,86015
-(defvar hyrolo-mode-syntax-table 2058,86108
-(defvar hyrolo-mode-map 2068,86494
+hyrolo.el,4986
+(defgroup hyperbole-rolo 84,3307
+(defcustom hyrolo-date-format 88,3422
+(defvar hyrolo-display-format-function94,3646
+(defcustom hyrolo-email-format 100,3888
+(defvar hyrolo-entry-name-regexp 106,4150
+(defcustom hyrolo-file-suffix-regexp 109,4314
+(defcustom hyrolo-find-file-function 113,4470
+(defcustom hyrolo-find-file-noselect-function 118,4688
+(defcustom hyrolo-google-contacts-flag 122,4848
+(defvar hyrolo-next-match-function 128,5089
+(defvar hyrolo-add-hook 134,5367
+(defvar hyrolo-edit-hook 137,5439
+(defun hyrolo-google-contacts-p 144,5604
+(defun hyrolo--initialize-file-list 157,6135
+(defun hyrolo-initialize-file-list 164,6384
+(define-obsolete-variable-alias 'rolo-file-list rolo-file-list174,6857
+(defcustom hyrolo-file-list 175,6932
+(defcustom hyrolo-highlight-face 187,7376
+(defcustom hyrolo-kill-buffers-after-use 192,7522
+(defcustom hyrolo-save-buffers-after-use 197,7697
+(defvar hyrolo-yank-reformat-function 205,7987
+(defun hyrolo-add 215,8422
+(defun hyrolo-display-matches 346,13521
+(defun hyrolo-edit 378,14823
+(defun hyrolo-edit-entry 424,16741
+(defun hyrolo-fgrep 446,17719
+(defun hyrolo-find-file 484,19657
+(defun hyrolo-find-file-noselect 508,20606
+(defun hyrolo-forward-visible-line 517,21006
+(defun hyrolo-grep 527,21336
+(defun hyrolo-grep-or-fgrep 605,24987
+(defun hyrolo-hide-subtree 611,25264
+(defun hyrolo-isearch 625,25729
+(defun hyrolo-isearch-regexp 641,26441
+(defun hyrolo-verify 651,26831
+(defun hyrolo-kill 664,27391
+(defun hyrolo-locate 717,29375
+(defun hyrolo-mail-to 722,29552
+(defun hyrolo-next-match 735,30019
+(defun hyrolo-overview 753,30762
+(defun hyrolo-previous-match 769,31413
+(defun hyrolo-prompt 782,31994
+(defun hyrolo-quit 786,32138
+(defun hyrolo-rename 794,32400
+(defun hyrolo-set-display-buffer 821,33519
+(defun hyrolo-sort 828,33731
+(defun hyrolo-sort-level 870,35360
+(defun hyrolo-sort-lines 893,36542
+(defun hyrolo-toggle-datestamps 910,37266
+(defun hyrolo-toggle-narrow-to-entry 925,37997
+(defun hyrolo-top-level 939,38476
+(defun hyrolo-widen 948,38735
+(defun hyrolo-word 954,38921
+(defun hyrolo-yank 980,40241
+(defun hyrolo-bbdb-fgrep 1002,41036
+(defun hyrolo-bbdb-grep 1009,41292
+(defun hyrolo-bbdb-grep-file 1037,42441
+(defun hyrolo-bbdb-entry-format 1052,43270
+(defun hyrolo-google-contacts-fgrep 1061,43609
+(defun hyrolo-google-contacts-grep 1068,43899
+(defun hyrolo-google-contacts-grep-file 1093,44894
+(defun hyrolo-google-contacts-insert-data 1106,45691
+(defun hyrolo-google-contacts-insert-generic-list 1201,51480
+(defun hyrolo-retrieve-google-contacts 1216,52081
+(defun hyrolo-helm-org-rifle 1240,53154
+(defun hyrolo-helm-org-rifle-directory 1263,54118
+(defun hyrolo-helm-org-rifle-directories 1282,54898
+(defun hyrolo-org 1292,55400
+(defun hyrolo-org-roam 1306,56030
+(defun hyrolo-back-to-visible-point 1329,57020
+(defun hyrolo-backward-same-level 1337,57382
+(defun hyrolo-consult-grep 1344,57650
+(defun hyrolo-fgrep-directories 1380,59246
+(defun hyrolo-fgrep-file 1384,59457
+(defun hyrolo-forward-same-level 1398,60169
+(defun hyrolo-grep-directories 1405,60433
+(defun hyrolo-next-regexp-match 1409,60634
+(defun hyrolo-grep-file 1416,60895
+(defun hyrolo-map-level 1516,64797
+(defun hyrolo-map-single-subtree 1553,66575
+(defun hyrolo-mode 1582,67610
+(defun hyrolo-next-visible-heading 1605,68410
+(defun hyrolo-previous-visible-heading 1613,68708
+(defun hyrolo-to 1621,69010
+(defun hyrolo-to-entry-beginning 1673,71118
+(defun hyrolo-to-entry-end 1688,71696
+(defun hyrolo-up-heading 1713,72518
+(defun hyrolo-add-match 1724,73008
+(defun hyrolo-buffer-exists-p 1736,73552
+(defun hyrolo-current-date 1744,73834
+(defun hyrolo-display-to-entry-end 1748,73988
+(defun hyrolo-format-name 1757,74272
+(defun hyrolo-get-consult-version 1764,74586
+(defun hyrolo-highlight-matches 1775,75054
+(defun hyrolo-isearch-for-regexp 1786,75457
+(defun hyrolo-kill-buffer 1797,75949
+(defun hyrolo-name-and-email 1804,76271
+(defun hyrolo-name-at 1839,77466
+(defun hyrolo-save-buffer 1852,77950
+(defun hyrolo-set-date 1860,78335
+(defun hyrolo-min-matched-level 1879,79054
+(defun hyrolo-search-directories 1887,79352
+(defun hyrolo-show-levels 1894,79709
+(defun hyrolo-shrink-window 1931,81113
+(defun hyrolo-to-buffer 1944,81558
+(defun hyrolo-move-backward 1948,81690
+(defun hyrolo-move-forward 1960,82134
+(defun hyrolo-mode-outline-level 1975,82592
+(define-obsolete-variable-alias 'rolo-display-buffer 
rolo-display-buffer1996,83466
+(defvar hyrolo-display-buffer 1997,83551
+(defvar hyrolo-entry-group-number 2000,83656
+(defvar hyrolo-entry-trailing-space-group-number 2004,83793
+(define-obsolete-variable-alias 'rolo-entry-regexp 
rolo-entry-regexp2007,83919
+(defvar hyrolo-entry-regexp 2008,84000
+(defconst hyrolo-hdr-format2027,84838
+(defconst hyrolo-hdr-regexp 2035,85197
+(defconst hyrolo-match-regexp 2040,85408
+(defvar hyrolo--wconfig 2045,85632
+(defvar hyrolo-mode-syntax-table 2048,85725
+(defvar hyrolo-mode-map 2058,86111
 
 hywconfig.el,642
 (define-obsolete-variable-alias 'wconfig-ring-max wconfig-ring-max61,2094
@@ -1875,34 +1882,36 @@ set.el,646
 (defun set:remove 60,2056
 (defun set:remove-key-value 77,2644
 (defun set:combinations 86,2977
-(defun set:create 111,3729
-(defalias 'set:delete set:delete123,4114
-(defun set:difference 124,4149
-(defalias 'set:size set:size135,4534
-(defun set:empty 137,4564
-(defun set:equal 141,4632
-(defun set:get 148,4883
-(defun set:intersection 154,5126
-(defun set:is 164,5464
-(defalias 'set:map set:map173,5728
-(defun set:members 175,5757
-(defun set:replace 183,6009
-(defun set:replace-key-value 191,6320
-(defun set:subset 200,6697
-(defun set:union 210,7039
-
-hypb-ert.el,447
-(defun hypb-ert-run-test 38,967
-(defun hypb-ert-run-tests 46,1211
-(defun hypb-ert-get-require-symbols 51,1377
-(defun hypb-ert-require-libraries 57,1624
-(defal hyperbole-run-test 60,1713
-(defal hyperbole-run-tests 61,1761
-(defun hypb-ert-run-all-tests 63,1811
-(defun hypb-ert-def-at-p 73,2104
-(defun hypb-ert-run-test-at-definition 85,2483
-(defib hyperbole-run-test-definition 103,3261
-(defun hyperbole-run-test-definition:help 110,3573
+(defun set:create 111,3730
+(defalias 'set:delete set:delete123,4115
+(defun set:difference 124,4151
+(defalias 'set:size set:size135,4536
+(defun set:empty 137,4567
+(defun set:equal 141,4635
+(defun set:get 148,4886
+(defun set:intersection 154,5129
+(defun set:is 164,5467
+(defalias 'set:map set:map173,5731
+(defun set:members 175,5761
+(defun set:replace 183,6013
+(defun set:replace-key-value 191,6324
+(defun set:subset 200,6701
+(defun set:union 210,7043
+
+hypb-ert.el,514
+(defun hypb-ert-message-function 34,956
+(defun hypb-ert 39,1143
+(defun hypb-ert-run-test 46,1465
+(defun hypb-ert-run-tests 54,1714
+(defun hypb-ert-get-require-symbols 59,1885
+(defun hypb-ert-require-libraries 65,2132
+(defal hyperbole-run-test 68,2221
+(defal hyperbole-run-tests 69,2269
+(defun hypb-ert-run-all-tests 71,2319
+(defun hypb-ert-def-at-p 81,2617
+(defun hypb-ert-run-test-at-definition 95,3120
+(defib hyperbole-run-test-definition 113,3903
+(defun hyperbole-run-test-definition:help 121,4320
 
 hui-dired-sidebar.el,36
 (defun smart-dired-sidebar 35,1188
@@ -1993,27 +2002,27 @@ kotl/kfile.el,623
 (defun kfile:pretty-print 522,19036
 (defun kfile:read-name 529,19409
 
-kotl/kfill.el,762
-(defvar kfill:prefix-table24,669
-(defconst kfill:hanging-expression68,2630
-(defvar prior-fill-prefix 76,2922
-(defun kfill:forward-line 85,3332
-(defun kfill:do-auto-fill 95,3645
-(defun kfill:fill-paragraph 108,4001
-(defun set-fill-prefix 146,5698
-(defun kfill:adapt 175,6917
-(defun kfill:c++-comment 188,7239
-(defun kfill:fallback-fill-paragraph 193,7412
-(defun kfill:hanging-list 225,8612
-(defun kfill:lisp-comment 249,9424
-(defun kfill:negate-string 256,9663
-(defun kfill:normal 272,10131
-(defun kfill:normal-included-text 277,10266
-(defun kfill:postscript-comment 284,10513
-(defun kfill:remove-paragraph-prefix 291,10758
-(defun kfill:replace-string 311,11476
-(defun kfill:sh-comment 346,12539
-(defun kfill:supercite-included-text 353,12782
+kotl/kfill.el,764
+(defvar kfill:prefix-table24,668
+(defconst kfill:hanging-expression68,2629
+(defvar prior-fill-prefix 76,2921
+(defun kfill:forward-line 85,3331
+(defun kfill:do-auto-fill 103,3959
+(defun kfill:fill-paragraph 117,4383
+(defun set-fill-prefix 155,6080
+(defun kfill:adapt 184,7299
+(defun kfill:c++-comment 197,7621
+(defun kfill:fallback-fill-paragraph 202,7794
+(defun kfill:hanging-list 237,9072
+(defun kfill:lisp-comment 261,9884
+(defun kfill:negate-string 268,10123
+(defun kfill:normal 284,10591
+(defun kfill:normal-included-text 289,10726
+(defun kfill:postscript-comment 296,10973
+(defun kfill:remove-paragraph-prefix 303,11218
+(defun kfill:replace-string 323,11936
+(defun kfill:sh-comment 358,12999
+(defun kfill:supercite-included-text 365,13242
 
 kotl/kimport.el,785
 (defvar kimport:mode-alist30,886
@@ -2090,16 +2099,16 @@ kotl/klink.el,470
 (defcustom klink:c-style-modes80,2707
 (defun klink:absolute 90,3085
 (defun klink:create 105,3832
-(defun klink:at-p 145,5569
-(defun klink:set-yank-handler 210,8442
-(defib klink 224,9034
-(defact link-to-kotl 233,9338
-(defun klink:act 269,10759
-(defun klink:parse 283,11296
-(defun klink:replace-label 314,12406
-(defun klink:update-label 328,12888
-(defun klink:yank-handler 340,13434
-(defvar klink:cell-ref-regexp359,14254
+(defun klink:at-p 146,5663
+(defun klink:set-yank-handler 211,8598
+(defib klink 225,9190
+(defact link-to-kotl 234,9494
+(defun klink:act 270,10915
+(defun klink:parse 284,11452
+(defun klink:replace-label 315,12562
+(defun klink:update-label 329,13044
+(defun klink:yank-handler 341,13590
+(defvar klink:cell-ref-regexp360,14410
 
 kotl/kmenu.el,236
 (defconst kotl-menu-common-body28,853
@@ -2109,7 +2118,7 @@ kotl/kmenu.el,236
 (defun kotl-menubar-menu 179,7646
 (defun kotl-popup-menu 188,8046
 
-kotl/kotl-mode.el,9397
+kotl/kotl-mode.el,9347
 (defvar kotl-mode-map 37,1230
 (defvar kotl-previous-mode 40,1320
 (defcustom kotl-mode:shrink-region-flag 43,1424
@@ -2218,91 +2227,90 @@ kotl/kotl-mode.el,9397
 (defun kotl-mode:mark-whole-buffer 1877,72417
 (defun kotl-mode:next-cell 1885,72670
 (defun kotl-mode:next-line 1899,73135
-(defun kotl-mode:next-tree 1924,74017
-(defun kotl-mode:previous-line 1936,74531
-(defun kotl-mode:previous-cell 1960,75394
-(defun kotl-mode:scroll-down 1981,76090
-(defun kotl-mode:scroll-up 1990,76407
-(defun kotl-mode:tail-cell 1999,76714
-(defun kotl-mode:up-level 2011,77107
-(defun kotl-mode:bobp 2037,78059
-(defun kotl-mode:bocp 2044,78279
-(defun kotl-mode:bolp 2057,78713
-(defun kotl-mode:buffer-empty-p 2062,78862
-(defun kotl-mode:eobp 2068,79049
-(defun kotl-mode:eocp 2073,79207
-(defun kotl-mode:eolp 2084,79520
-(defun kotl-mode:first-cell-p 2095,79918
-(defalias 'kotl-mode:first-line-p kotl-mode:first-line-p2099,80060
-(defun kotl-mode:last-cell-p 2101,80110
-(defun kotl-mode:last-line-p 2105,80246
-(defun kotl-mode:action-key 2116,80593
-(defun kotl-mode:assist-key 2158,82489
-(defun kotl-mode:add-child 2199,84374
-(defun kotl-mode:add-parent 2204,84522
-(defun kotl-mode:add-cell 2209,84674
-(defun kotl-mode:demote-tree 2292,87890
-(defun kotl-mode:exchange-cells 2354,90070
-(defun kotl-mode:kill-contents 2432,92915
-(defun kotl-mode:kill-tree 2440,93163
-(defun kotl-mode:move-tree-backward 2468,94175
-(defun kotl-mode:move-tree-forward 2477,94539
-(defun kotl-mode:promote-tree 2501,95497
-(defun kotl-mode:remove-cell-attribute 2545,97001
-(defun kotl-mode:set-cell-attribute 2590,98675
-(defun kotl-mode:set-or-remove-cell-attribute 2648,100942
-(defun kotl-mode:split-cell 2670,101955
-(defun kotl-mode:transpose-cells 2701,103154
-(defun kotl-mode:copy-region-to-buffer 2755,105250
-(defun kotl-mode:copy-tree-to-buffer 2778,106241
-(defun kotl-mode:copy-tree-or-region-to-buffer 2808,107579
-(defun kotl-mode:mail-tree 2821,108082
-(defun kotl-mode:collapse-tree 2848,109024
-(defun kotl-mode:expand-tree 2860,109507
-(defun kotl-mode:toggle-tree-expansion 2874,110054
-(defun kotl-mode:overview 2887,110502
-(defun kotl-mode:show-all 2897,110788
-(defun kotl-mode:top-cells 2911,111278
-(defun kotl-mode:hide-sublevels 2926,111766
-(defun kotl-mode:hide-subtree 2937,112276
-(defun kotl-mode:show-subtree 2954,112908
-(defun kotl-mode:hide-tree 2960,113113
-(defun kotl-mode:show-tree 2980,113840
-(defun kotl-mode:cell-attributes 2985,113993
-(defun kotl-mode:cell-help 3000,114570
-(defun kotl-mode:get-cell-attribute 3054,116614
-(defun kotl-mode:org-delete-backward-char 3081,117716
-(defun kotl-mode:org-delete-char 3091,118217
-(defun kotl-mode:org-force-self-insert 3101,118696
-(defun kotl-mode:org-self-insert-command 3107,118876
-(defun kotl-mode:orgtbl-ctrl-c-ctrl-c 3115,119224
-(defun kotl-mode:orgtbl-create-or-convert-from-region 3123,119502
-(defun kotl-mode:orgtbl-self-insert-command 3131,119855
-(defun kotl-mode:self-insert-command 3140,120208
-(defun kotl-mode:add-indent-to-region 3158,121129
-(defun kotl-mode:delete-line 3170,121635
-(defun kotl-mode:exchange-point-and-mark 3184,122123
-(defun kotl-mode:indent-line 3190,122401
-(defun kotl-mode:indent-region 3204,122891
-(defun kotl-mode:is-p 3209,123019
-(defun kotl-mode:shrink-region 3216,123259
-(defun kotl-mode:valid-region-p 3235,124135
-(defun kotl-mode:maybe-shrink-region-p 3245,124529
-(defun kotl-mode:tree-end 3270,125515
-(defun kotl-mode:tree-start 3289,126262
-(defun kotl-mode:line-move 3294,126451
-(defun kotl-mode:pre-self-insert-command 3313,127124
-(defun kotl-mode:print-attributes 3328,127740
-(defun kotl-mode:isearch-open-invisible 3347,128489
-(defun kotl-mode:reveal-toggle-invisible 3350,128633
-(defun kotl-mode:set-temp-goal-column 3391,130338
-(defun kotl-mode:to-visible-position 3402,130740
-(defun kotl-mode:to-valid-position 3415,131307
-(defun kotl-mode:transpose-lines-internal 3432,132009
-(defun kotl-mode:update-buffer 3455,132784
-(defun kotl-mode:maintain-region-highlight 3466,133107
-(defun kotl-mode:setup-keymap 3471,133264
-(defun delete-selection-pre-hook 3684,142610
+(defun kotl-mode:next-tree 1930,74165
+(defun kotl-mode:previous-line 1942,74679
+(defun kotl-mode:previous-cell 1965,75463
+(defun kotl-mode:scroll-down 1986,76159
+(defun kotl-mode:scroll-up 1995,76476
+(defun kotl-mode:tail-cell 2004,76783
+(defun kotl-mode:up-level 2016,77175
+(defun kotl-mode:bobp 2042,78127
+(defun kotl-mode:bocp 2049,78347
+(defun kotl-mode:bolp 2062,78781
+(defun kotl-mode:buffer-empty-p 2067,78930
+(defun kotl-mode:eobp 2073,79117
+(defun kotl-mode:eocp 2078,79275
+(defun kotl-mode:eolp 2089,79588
+(defun kotl-mode:first-cell-p 2100,79986
+(defalias 'kotl-mode:first-line-p kotl-mode:first-line-p2104,80128
+(defun kotl-mode:last-cell-p 2106,80178
+(defun kotl-mode:last-line-p 2110,80314
+(defun kotl-mode:action-key 2121,80661
+(defun kotl-mode:assist-key 2163,82557
+(defun kotl-mode:add-child 2204,84442
+(defun kotl-mode:add-parent 2209,84590
+(defun kotl-mode:add-cell 2214,84742
+(defun kotl-mode:demote-tree 2297,87958
+(defun kotl-mode:exchange-cells 2359,90138
+(defun kotl-mode:kill-contents 2437,92983
+(defun kotl-mode:kill-tree 2445,93231
+(defun kotl-mode:move-tree-backward 2473,94243
+(defun kotl-mode:move-tree-forward 2482,94607
+(defun kotl-mode:promote-tree 2506,95565
+(defun kotl-mode:remove-cell-attribute 2550,97069
+(defun kotl-mode:set-cell-attribute 2595,98743
+(defun kotl-mode:set-or-remove-cell-attribute 2653,101010
+(defun kotl-mode:split-cell 2675,102023
+(defun kotl-mode:transpose-cells 2706,103222
+(defun kotl-mode:copy-region-to-buffer 2760,105318
+(defun kotl-mode:copy-tree-to-buffer 2783,106309
+(defun kotl-mode:copy-tree-or-region-to-buffer 2813,107647
+(defun kotl-mode:mail-tree 2826,108150
+(defun kotl-mode:collapse-tree 2853,109092
+(defun kotl-mode:expand-tree 2865,109575
+(defun kotl-mode:toggle-tree-expansion 2879,110122
+(defun kotl-mode:overview 2892,110570
+(defun kotl-mode:show-all 2902,110856
+(defun kotl-mode:top-cells 2916,111346
+(defun kotl-mode:hide-sublevels 2931,111834
+(defun kotl-mode:hide-subtree 2942,112344
+(defun kotl-mode:show-subtree 2959,112976
+(defun kotl-mode:hide-tree 2965,113181
+(defun kotl-mode:show-tree 2985,113908
+(defun kotl-mode:cell-attributes 2990,114061
+(defun kotl-mode:cell-help 3005,114638
+(defun kotl-mode:get-cell-attribute 3059,116682
+(defun kotl-mode:org-delete-backward-char 3086,117784
+(defun kotl-mode:org-delete-char 3096,118285
+(defun kotl-mode:org-force-self-insert 3106,118764
+(defun kotl-mode:org-self-insert-command 3112,118944
+(defun kotl-mode:orgtbl-ctrl-c-ctrl-c 3120,119292
+(defun kotl-mode:orgtbl-create-or-convert-from-region 3128,119570
+(defun kotl-mode:orgtbl-self-insert-command 3136,119923
+(defun kotl-mode:add-indent-to-region 3163,121236
+(defun kotl-mode:delete-line 3175,121742
+(defun kotl-mode:exchange-point-and-mark 3189,122230
+(defun kotl-mode:indent-line 3195,122508
+(defun kotl-mode:indent-region 3209,122998
+(defun kotl-mode:is-p 3214,123126
+(defun kotl-mode:shrink-region 3221,123366
+(defun kotl-mode:valid-region-p 3240,124242
+(defun kotl-mode:maybe-shrink-region-p 3250,124636
+(defun kotl-mode:tree-end 3275,125622
+(defun kotl-mode:tree-start 3294,126369
+(defun kotl-mode:line-move 3299,126558
+(defun kotl-mode:pre-self-insert-command 3319,127236
+(defun kotl-mode:print-attributes 3334,127855
+(defun kotl-mode:isearch-open-invisible 3353,128604
+(defun kotl-mode:reveal-toggle-invisible 3356,128748
+(defun kotl-mode:set-temp-goal-column 3397,130453
+(defun kotl-mode:to-visible-position 3408,130855
+(defun kotl-mode:to-valid-position 3421,131422
+(defun kotl-mode:transpose-lines-internal 3438,132124
+(defun kotl-mode:update-buffer 3461,132899
+(defun kotl-mode:maintain-region-highlight 3472,133222
+(defun kotl-mode:setup-keymap 3477,133379
+(defun delete-selection-pre-hook 3690,142725
 
 kotl/kotl-orgtbl.el,275
 (defvar kotl-mode-overriding-orgtbl-mode-map 60,2554
@@ -2349,100 +2357,100 @@ kotl/kproperty.el,602
 (defun kproperty:set 118,4711
 
 kotl/kview.el,3685
-(define-obsolete-variable-alias 'label-sep-len label-sep-len25,736
-(defvar kview-label-sep-len 26,813
-(defcustom kview:default-blank-lines 35,1126
-(defvar kview:default-levels-to-show 42,1368
-(defvar kview:default-lines-to-show 45,1487
-(defcustom kview:default-label-min-width 48,1607
-(defcustom kview:default-label-separator 55,1910
-(defconst kview:outline-regexp 61,2098
-(defcustom kview:default-label-type 66,2315
-(defcustom kview:default-level-indent 80,2896
-(defun kcell-view:backward 95,3402
-(defun kcell-view:cell 123,4375
-(defun kcell-view:cell-from-ref 127,4513
-(defun kcell-view:child 142,5212
-(defun kcell-view:child-p 162,6051
-(defun kcell-view:collapse 172,6441
-(defun kcell-view:collapsed-p 181,6853
-(defun kcell-view:hide 194,7443
-(defun kcell-view:invisible-p 200,7717
-(defun kcell-view:contents 216,8393
-(defun kcell-view:create 236,9140
-(defun kcell-view:end 293,11339
-(defun kcell-view:end-contents 302,11605
-(defun kcell-view:expand 312,11903
-(defun kcell-view:forward 318,12168
-(defun kcell-view:get-attr 346,13173
-(defun kcell-view:idstamp-integer 359,13647
-(defun kcell-view:idstamp 365,13871
-(defun kcell-view:indent 371,14104
-(defun kcell-view:label 381,14520
-(defun kcell-view:level 394,14976
-(defun kcell-view:line 405,15537
-(defun kcell-view:lines-visible 414,15882
-(defun kcell-view:next 424,16337
-(defun kcell-view:next-invisible-p 432,16644
-(defun kcell-view:operate 437,16902
-(defun kcell-view:parent 445,17231
-(defun kcell-view:previous 467,18117
-(defun kcell-view:plist 475,18440
-(defun kcell-view:plist-point 479,18589
-(defun kcell-view:to-label-end 484,18788
-(defun kcell-view:absolute-reference 512,20114
-(defun kcell-view:reference 523,20621
-(defun kcell-view:remove-attr 535,21245
-(defun kcell-view:set-attr 550,21861
-(defun kcell-view:set-cell 566,22538
-(defun kcell-view:sibling-p 573,22776
-(defun kcell-view:start 581,23067
-(defun kcell-view:to-visible-label-end 587,23318
-(defun kcell-view:visible-label 602,23968
-(defun kview:add-cell 615,24404
-(defun kview:beginning-of-actual-line 628,25057
-(defun kview:buffer 633,25240
-(defun kview:char-invisible-p 639,25414
-(defun kview:create 644,25598
-(defun kview:delete-region 701,27874
-(defun kview:end-of-actual-line 705,28008
-(defun kview:fill-region 710,28179
-(defun kview:first-invisible-point 735,29122
-(defun kview:first-visible-point 751,29845
-(defun kview:get-cells-status 764,30390
-(defun kview:goto-cell-id 785,31296
-(defun kview:id-counter 797,31715
-(defun kview:id-increment 801,31880
-(defun kview:idstamp-to-label 807,32100
-(defun kview:insert-contents 813,32312
-(defun kview:is-p 860,33946
-(defun kview:kotl 865,34051
-(defun kview:label 870,34206
-(defun kview:label-function 875,34428
-(defun kview:label-min-width 882,34795
-(defun kview:label-separator 888,35037
-(defun kview:label-separator-length 894,35279
-(defun kview:label-type 899,35504
-(defun kview:level-indent 905,35726
-(defun kview:map-branch 911,35960
-(defun kview:map-cells 943,37386
-(defun kview:map-region 956,37842
-(defun kview:map-siblings 996,39392
-(defun kview:map-expanded-tree 1025,40578
-(defun kview:map-tree 1083,42993
-(defun kview:move 1121,44685
-(defun kview:previous-visible-point 1193,47119
-(defun kview:set-buffer 1209,47809
-(defun kview:set-cells-status 1218,48104
-(defun kview:set-label-type 1246,49405
-(defun kview:top-cell 1278,50550
-(defun kview:valid-position-p 1283,50723
-(defun kview:get-attr 1308,51742
-(defun kcell-view:next-kcell 1312,51874
-(defun kcell-view:previous-kcell 1325,52484
-(defun kview:set-attr 1344,53411
-(defun kview:set-functions 1355,53733
-(defun kview:set-label-separator 1362,54139
+(define-obsolete-variable-alias 'label-sep-len label-sep-len25,737
+(defvar kview-label-sep-len 26,814
+(defcustom kview:default-blank-lines 35,1127
+(defvar kview:default-levels-to-show 42,1369
+(defvar kview:default-lines-to-show 45,1488
+(defcustom kview:default-label-min-width 48,1608
+(defcustom kview:default-label-separator 55,1911
+(defconst kview:outline-regexp 61,2099
+(defcustom kview:default-label-type 66,2316
+(defcustom kview:default-level-indent 80,2897
+(defun kcell-view:backward 95,3403
+(defun kcell-view:cell 123,4376
+(defun kcell-view:cell-from-ref 127,4514
+(defun kcell-view:child 142,5213
+(defun kcell-view:child-p 162,6052
+(defun kcell-view:collapse 172,6442
+(defun kcell-view:collapsed-p 181,6854
+(defun kcell-view:hide 194,7444
+(defun kcell-view:invisible-p 200,7718
+(defun kcell-view:contents 216,8394
+(defun kcell-view:create 236,9141
+(defun kcell-view:end 293,11340
+(defun kcell-view:end-contents 302,11606
+(defun kcell-view:expand 312,11904
+(defun kcell-view:forward 318,12169
+(defun kcell-view:get-attr 346,13174
+(defun kcell-view:idstamp-integer 359,13648
+(defun kcell-view:idstamp 365,13872
+(defun kcell-view:indent 371,14105
+(defun kcell-view:label 381,14521
+(defun kcell-view:level 394,14977
+(defun kcell-view:line 405,15538
+(defun kcell-view:lines-visible 414,15883
+(defun kcell-view:next 424,16338
+(defun kcell-view:next-invisible-p 432,16645
+(defun kcell-view:operate 437,16903
+(defun kcell-view:parent 445,17232
+(defun kcell-view:previous 467,18118
+(defun kcell-view:plist 475,18441
+(defun kcell-view:plist-point 479,18590
+(defun kcell-view:to-label-end 484,18789
+(defun kcell-view:absolute-reference 512,20132
+(defun kcell-view:reference 523,20639
+(defun kcell-view:remove-attr 535,21263
+(defun kcell-view:set-attr 550,21879
+(defun kcell-view:set-cell 566,22556
+(defun kcell-view:sibling-p 573,22794
+(defun kcell-view:start 581,23085
+(defun kcell-view:to-visible-label-end 587,23336
+(defun kcell-view:visible-label 602,23986
+(defun kview:add-cell 615,24422
+(defun kview:beginning-of-actual-line 628,25075
+(defun kview:buffer 633,25258
+(defun kview:char-invisible-p 639,25432
+(defun kview:create 644,25616
+(defun kview:delete-region 701,27892
+(defun kview:end-of-actual-line 705,28026
+(defun kview:fill-region 710,28197
+(defun kview:first-invisible-point 735,29140
+(defun kview:first-visible-point 751,29863
+(defun kview:get-cells-status 764,30408
+(defun kview:goto-cell-id 785,31314
+(defun kview:id-counter 797,31733
+(defun kview:id-increment 801,31898
+(defun kview:idstamp-to-label 807,32118
+(defun kview:insert-contents 813,32330
+(defun kview:is-p 860,33964
+(defun kview:kotl 865,34069
+(defun kview:label 870,34224
+(defun kview:label-function 875,34446
+(defun kview:label-min-width 882,34813
+(defun kview:label-separator 888,35055
+(defun kview:label-separator-length 894,35297
+(defun kview:label-type 899,35522
+(defun kview:level-indent 905,35744
+(defun kview:map-branch 911,35978
+(defun kview:map-cells 943,37404
+(defun kview:map-region 956,37860
+(defun kview:map-siblings 996,39410
+(defun kview:map-expanded-tree 1025,40596
+(defun kview:map-tree 1083,43011
+(defun kview:move 1121,44703
+(defun kview:previous-visible-point 1193,47137
+(defun kview:set-buffer 1209,47827
+(defun kview:set-cells-status 1218,48122
+(defun kview:set-label-type 1246,49423
+(defun kview:top-cell 1278,50568
+(defun kview:valid-position-p 1283,50741
+(defun kview:get-attr 1308,51760
+(defun kcell-view:next-kcell 1312,51892
+(defun kcell-view:previous-kcell 1325,52502
+(defun kview:set-attr 1344,53429
+(defun kview:set-functions 1355,53751
+(defun kview:set-label-separator 1362,54157
 
 kotl/kvspec.el,700
 (defvar kvspec:current 65,2524
@@ -2465,86 +2473,104 @@ kotl/kvspec.el,700
 (defvar kvspec:string 340,12387
 (defvar kvspec:string-format 345,12593
 
-test/demo-tests.el,2627
-(ert-deftest demo-smart-mouse-keys-ref-test 39,1037
-(ert-deftest demo-smart-mouse-keys-ebut-test 51,1401
-(ert-deftest demo-table-of-contents-test 62,1730
-(ert-deftest demo-smart-scrolling-proportional-test 74,2077
-(ert-deftest demo-smart-scrolling-non-proportional-test 89,2561
-(ert-deftest demo-action-key-help 106,3056
-(ert-deftest demo-assist-key-help 116,3384
-(ert-deftest demo-window-grid-22-test 127,3727
-(ert-deftest demo-window-grid-33-test 137,4076
-(ert-deftest demo-hyrolo-test 148,4435
-(ert-deftest demo-hy-info-test 160,4853
-(ert-deftest demo-hy-history-test 170,5126
-(ert-deftest demo-implicit-button-test 188,5675
-(ert-deftest demo-implicit-button-action-button-action-type-invocation-test 
197,5967
-(ert-deftest demo-implicit-button-action-button-function-call-test 207,6340
-(ert-deftest demo-implicit-button-action-button-sexp-test 214,6561
-(ert-deftest demo-implicit-button-action-button-boolean-function-call-test 
234,7455
+test/demo-tests.el,2725
+(ert-deftest demo-smart-mouse-keys-ref-test 39,1036
+(ert-deftest demo-smart-mouse-keys-ebut-test 51,1400
+(ert-deftest demo-table-of-contents-test 62,1729
+(ert-deftest demo-smart-scrolling-proportional-test 74,2076
+(ert-deftest demo-smart-scrolling-non-proportional-test 89,2560
+(ert-deftest demo-action-key-help 106,3055
+(ert-deftest demo-assist-key-help 116,3383
+(ert-deftest demo-window-grid-22-test 127,3726
+(ert-deftest demo-window-grid-33-test 137,4075
+(ert-deftest demo-hyrolo-test 148,4434
+(ert-deftest demo-hy-info-test 160,4852
+(ert-deftest demo-hy-history-test 170,5125
+(ert-deftest demo-implicit-button-test 188,5674
+(ert-deftest demo-implicit-button-action-button-action-type-invocation-test 
197,5966
+(ert-deftest demo-implicit-button-action-button-function-call-test 207,6339
+(ert-deftest demo-implicit-button-action-button-sexp-test 214,6560
+(ert-deftest demo-implicit-button-action-button-display-boolean-test 234,7454
 (ert-deftest demo-implicit-button-action-button-variable-display-test 241,7706
 (ert-deftest demo-implicit-button-hash-link-test 248,7958
 (ert-deftest demo-implicit-button-line-and-column-test 258,8374
 (ert-deftest demo-org-hide-header-test 269,8754
 (ert-deftest demo-manifest-test 286,9321
 (ert-deftest demo-mail-compose-test 301,9802
-(defun demo-should-browse-twitter-url 311,10061
-(ert-deftest demo-social-twitter-test 317,10288
-(defun demo-should-browse-github-url 325,10486
-(ert-deftest demo-www-test 331,10711
-(ert-deftest demo-github-user-default-test 340,10985
-(ert-deftest demo-github-ignore-default-test 348,11243
-(ert-deftest demo-occur-test 357,11521
-(ert-deftest demo-annotated-reference-test 371,12029
-(ert-deftest demo-man-appropos-test 384,12445
-(ert-deftest demo-factorial-test 393,12645
-(ert-deftest demo-factorial-ebutton-test 403,13012
-(ert-deftest fast-demo-key-series-help-buffer 415,13398
-(ert-deftest fast-demo-key-series-window-grid-22 426,13781
-(ert-deftest fast-demo-key-series-kotl-files 436,14100
-(ert-deftest fast-demo-key-series-emacs-lisp-mode 451,14644
-(ert-deftest fast-demo-key-series-hyperbole-dir 463,15099
-(ert-deftest fast-demo-key-series-keep-lines-ext 474,15501
-(ert-deftest fast-demo-key-series-keep-lines-slash 495,16371
-(ert-deftest fast-demo-key-series-keep-lines-dired 514,17133
-(ert-deftest fast-demo-key-series-shell-cd-hyperb-dir 533,17869
-(ert-deftest fast-demo-key-series-shell-grep 556,18932
-(ert-deftest fast-demo-key-series-shell-apropos 577,20136
-(ert-deftest fast-demo-key-series-shell-cd-hyperb-dir-view-mode 598,21211
-(ert-deftest fast-demo-key-series-shell-grep-view-mode 622,22333
+(defvar hypb-should-browse-demo-was-called 310,10060
+(defun demo-should-browse-twitter-url 313,10166
+(ert-deftest demo-social-twitter-test 320,10439
+(defun demo-should-browse-github-url 329,10737
+(ert-deftest demo-www-test 336,11008
+(ert-deftest demo-www-test-with-quotes 346,11373
+(ert-deftest demo-github-user-default-test 361,11934
+(ert-deftest demo-github-ignore-default-test 371,12293
+(ert-deftest demo-occur-test 382,12672
+(ert-deftest demo-annotated-reference-test 396,13180
+(ert-deftest demo-man-appropos-test 411,13630
+(ert-deftest demo-factorial-test 420,13830
+(ert-deftest demo-factorial-ebutton-test 430,14197
+(ert-deftest fast-demo-key-series-help-buffer 442,14583
+(ert-deftest fast-demo-key-series-window-grid-22 456,15066
+(ert-deftest fast-demo-key-series-kotl-files 466,15385
+(ert-deftest fast-demo-key-series-emacs-lisp-mode 481,15929
+(ert-deftest fast-demo-key-series-hyperbole-dir 493,16384
+(ert-deftest fast-demo-key-series-keep-lines-ext 504,16786
+(ert-deftest fast-demo-key-series-keep-lines-slash 525,17656
+(ert-deftest fast-demo-key-series-keep-lines-dired 544,18418
+(ert-deftest fast-demo-key-series-shell-cd-hyperb-dir 563,19154
+(ert-deftest fast-demo-key-series-shell-grep 586,20217
+(ert-deftest fast-demo-key-series-shell-apropos 607,21421
+(ert-deftest fast-demo-key-series-shell-cd-hyperb-dir-view-mode 628,22496
+(ert-deftest fast-demo-key-series-shell-grep-view-mode 652,23618
 
 test/hactypes-tests.el,95
 (ert-deftest display-boolean-true-test 27,616
-(ert-deftest display-boolean-false-test 31,768
+(ert-deftest display-boolean-false-test 31,775
 
 test/hargs-tests.el,122
 (ert-deftest hargs-get-verify-extension-characters 26,601
 (ert-deftest hargs-get-verify-extension-characters-+K 45,1457
 
-test/hbut-tests.el,1299
+test/hbut-tests.el,2399
 (defun hbut-tests:should-match-tmp-folder 28,602
-(ert-deftest ebut-program-link-to-directory 34,873
-(ert-deftest ebut-program-link-to-directory-2 47,1483
-(ert-deftest ebut-program-shell-cmd 57,2003
-(ert-deftest ebut-delete-removes-ebut-and-returns-button-data 67,2439
-(ert-deftest gbut-program-calls-ebut-program 80,2901
-(ert-deftest gbut-program-link-to-directory 91,3424
-(ert-deftest gbut-program-eval-elisp 107,4249
-(ert-deftest gbut-program-link-to-file 120,4869
-(ert-deftest gbut-program-link-to-file-line 133,5511
-(ert-deftest gbut-program-link-to-file-line-and-column 146,6174
-(ert-deftest hypb:program-create-ebut-in-buffer 159,6875
-(ert-deftest hypb:program-create-ebut-in-buffer-with-same-label 167,7260
-(ert-deftest hypb:program-create-link-to-file-line-and-column-but-in-file 
175,7650
-(ert-deftest 
hypb--ebut-at-p-should-not-insert-hbdata-section-in-non-file-buffers 185,8209
-(ert-deftest hbut-tests-ibut-program-link-to-directory 194,8554
-(ert-deftest hbut-tests-ibut-program-link-to-file 200,8802
-(ert-deftest hbut-tests-ibut-insert-text-link-to-dir 211,9219
-(ert-deftest hbut-tests-ibut-insert-annot-bib 223,9672
-(ert-deftest hbut-tests-ibut-insert-kbd-key 246,10424
-(defconst hbut-tests-actypes-list269,11148
-(ert-deftest hbut-tests-ibut-insert-links 293,12531
+(ert-deftest ebut-program-link-to-directory 34,904
+(ert-deftest ebut-program-link-to-directory-2 47,1520
+(ert-deftest ebut-program-shell-cmd 57,2040
+(ert-deftest ebut-delete-removes-ebut-and-returns-button-data 67,2476
+(ert-deftest gbut-program-calls-ebut-program 80,2938
+(ert-deftest gbut-program-link-to-directory 91,3461
+(ert-deftest gbut-program-eval-elisp 107,4292
+(ert-deftest gbut-program-link-to-file 120,4912
+(ert-deftest gbut-program-link-to-file-line 133,5554
+(ert-deftest gbut-program-link-to-file-line-and-column 146,6217
+(ert-deftest hypb:program-create-ebut-in-buffer 160,6931
+(ert-deftest hypb:program-create-ebut-in-buffer-with-same-label 168,7322
+(ert-deftest hypb:program-create-link-to-file-line-and-column-but-in-file 
176,7712
+(ert-deftest 
hypb--ebut-at-p-should-not-insert-hbdata-section-in-non-file-buffers 186,8271
+(ert-deftest hbut-tests-ibut-program-link-to-directory 195,8616
+(ert-deftest hbut-tests-ibut-program-link-to-file 201,8862
+(ert-deftest hbut-tests-ibut-insert-text-link-to-dir 212,9277
+(ert-deftest hbut-tests-ibut-insert-annot-bib 224,9728
+(ert-deftest hbut-tests-ibut-insert-kbd-key 247,10478
+(defconst hbut-tests-actypes-list270,11200
+(ert-deftest hbut-tests-ibut-insert-links 294,12583
+(ert-deftest hbut-tests--ibut-operate--none 343,14407
+(ert-deftest hbut-tests--ibut-operate--fail-create-add-name 367,15723
+(ert-deftest hbut-tests--ibut-operate--name 389,16881
+(ert-deftest hbut-tests--ibut-operate--fail-rename-from-name 413,18084
+(ert-deftest hbut-tests--ibut-operate--fail-rename-from-name-ignore-region 
436,19369
+(ert-deftest hbut-tests--ibut-operate--name-ignore-region 463,20806
+(ert-deftest hbut-tests--ibut-operate--region 488,22124
+(ert-deftest hbut-tests--ibut-operate--fail-new-name-ignore-region 511,23258
+(ert-deftest hbut-tests--ibut-operate--remove-name 536,24633
+(ert-deftest hbut-tests--ibut-operate--add-new-name 560,25841
+(ert-deftest hbut-tests--ibut-operate--add-name 585,27131
+(ert-deftest hbut-tests--ibut-operate--rename-from-name 610,28449
+(ert-deftest hbut-tests--ibut-operate--fail-rename-ignore-region 634,29758
+(ert-deftest hbut-tests--ibut-operate--fail-name-ignore-region 655,30847
+(ert-deftest hbut-tests--ibut-operate--fail-rename-from-region 676,31911
+(ert-deftest hbut-tests--ibut-operate--fail-add-new-name-ignore-region 
697,32959
 
 test/hib-kbd-tests.el,96
 (ert-deftest kbd-key-hy-about-test 28,705
@@ -2582,53 +2608,57 @@ test/hibtypes-tests.el,1254
 (ert-deftest ibtypes::man-apropos-test 288,8899
 (ert-deftest ibtypes::info-node-test 323,9308
 
-test/hmouse-drv-tests.el,2403
+test/hmouse-drv-tests.el,2629
 (ert-deftest hbut-defal 28,674
 (defun hbut-defal-url 39,1055
 (ert-deftest hbut-defal-url 44,1266
 (ert-deftest hbut-defal-url-%s 54,1591
 (ert-deftest hbut-defal-key-sequence 65,1954
 (defun hbut-verify-defal 78,2366
-(ert-deftest hbut-defal-function 82,2489
-(ert-deftest hbut-defal-fails-on-file-missing 93,2802
-(ert-deftest hbut-defil-it 107,3271
-(ert-deftest hbut-defil 119,3675
-(ert-deftest hbut-defil-url 129,3994
-(ert-deftest hbut-defil-key-sequence 139,4330
-(ert-deftest hbut-ib-link-to-file-with-label 153,4763
-(ert-deftest hbut-ib-link-to-file-with-label-variants 159,4994
-(ert-deftest hbut-ib-url-with-label 167,5405
-(ert-deftest hbut-ib-create-label 175,5662
-(ert-deftest hbut-ib-create-label-fails-if-label-exists 184,5939
-(ert-deftest hbut-pathname-path-variable-test 197,6408
-(ert-deftest hbut-pathname-path-variable-with-two-colons-a-path-test 204,6643
-(ert-deftest hbut-pathname-path-variable-with-three-colons-is-a-path-test 
211,6901
-(ert-deftest 
hbut-pathname-path-variable-with-short-first-element-is-not-tramp-url-test 
218,7225
-(ert-deftest hbut-mail-address-test 226,7538
-(ert-deftest hbut-pathname-test 237,7826
-(ert-deftest hbut-pathname-lisp-variable-test 246,8095
-(ert-deftest hbut-pathname-env-variable-test 255,8348
-(ert-deftest hbut-pathname-emacs-lisp-file-test 266,8676
-(ert-deftest hbut-pathname-anchor-test 277,9028
-(ert-deftest hbut-pathname-anchor-line-test 288,9357
-(ert-deftest hbut-pathname-line-column-test 300,9742
-(ert-deftest hbut-pathname-load-path-line-column-test 312,10134
-(ert-deftest hbut-pathname-with-dash-loads-file-test 324,10557
-(ert-deftest hbut-pathname-directory-test 333,10889
-(ert-deftest hbut-pathname-dot-slash-in-other-folder-should-fail-test 
344,11208
-(ert-deftest hbut-annot-bib-test 361,11853
-(ert-deftest hbut-ctags-vgrind-test 376,12339
-(ert-deftest hbut-etags-test 390,12881
-(ert-deftest hbut-text-toc-test 407,13505
-(ert-deftest hbut-dir-summary-test 419,13822
-(ert-deftest hbut-rfc-test 434,14262
-(ert-deftest hbut-man-apropos-test 444,14517
-(ert-deftest hbut-info-node-test 453,14707
-(ert-deftest hbut-find-exec-shell-cmd-test 464,14986
-(ert-deftest hbut-find-exec-window-cmd-test 477,15436
-(ert-deftest hbut-load-modifier-loads-file 489,15865
-(ert-deftest hbut-load-modifier-with-plain-file-loads-file-from-load-path 
501,16280
-(ert-deftest hbut-key-press-on-hyphen-in-elisp-symbol 510,16597
+(ert-deftest hbut-defal-function 82,2490
+(ert-deftest hbut-defal-fails-on-file-missing 92,2789
+(ert-deftest hbut-defil-it 106,3258
+(ert-deftest hbut-defil 118,3678
+(ert-deftest hbut-defil-url 128,3997
+(ert-deftest hbut-defil-key-sequence 138,4333
+(ert-deftest hbut-ib-link-to-file-with-label 152,4766
+(ert-deftest hbut-ib-link-to-file-with-label-variants 158,4997
+(ert-deftest hbut-ib-url-with-label 166,5408
+(ert-deftest hbut-ib-create-label 174,5665
+(ert-deftest hbut-ib-create-label-fails-if-label-exists 184,5980
+(ert-deftest hbut-pathname-path-variable-test 197,6449
+(ert-deftest hbut-pathname-path-variable-with-two-colons-a-path-test 204,6684
+(ert-deftest hbut-pathname-path-variable-with-three-colons-is-a-path-test 
211,6942
+(ert-deftest 
hbut-pathname-path-variable-with-short-first-element-is-not-tramp-url-test 
218,7288
+(ert-deftest hbut-mail-address-test 226,7601
+(ert-deftest hbut-pathname-test 237,7905
+(ert-deftest hbut-pathname-lisp-variable-test 246,8190
+(ert-deftest hbut-pathname-env-variable-test 255,8459
+(ert-deftest hbut-pathname-emacs-lisp-file-test 264,8746
+(ert-deftest hbut-pathname-line-test 275,9116
+(ert-deftest hbut-pathname-line-test-duplicate 288,9571
+(ert-deftest hbut-pathname-anchor-test 308,10318
+(ert-deftest hbut-pathname-anchor-trailing-text 321,10767
+(ert-deftest hbut-pathname-anchor-must-match-all 334,11316
+(ert-deftest hbut-pathname-anchor-line-test 350,12020
+(ert-deftest hbut-pathname-line-column-test 363,12494
+(ert-deftest hbut-pathname-load-path-line-column-test 378,13071
+(ert-deftest hbut-pathname-with-dash-loads-file-test 390,13510
+(ert-deftest hbut-pathname-directory-test 399,13842
+(ert-deftest hbut-pathname-dot-slash-in-other-folder-should-fail-test 
410,14177
+(ert-deftest hbut-annot-bib-test 427,14822
+(ert-deftest hbut-ctags-vgrind-test 442,15324
+(ert-deftest hbut-etags-test 455,15838
+(ert-deftest hbut-text-toc-test 472,16478
+(ert-deftest hbut-dir-summary-test 484,16811
+(ert-deftest hbut-rfc-test 498,17267
+(ert-deftest hbut-man-apropos-test 508,17522
+(ert-deftest hbut-info-node-test 517,17712
+(ert-deftest hbut-find-exec-shell-cmd-test 528,18007
+(ert-deftest hbut-find-exec-window-cmd-test 541,18457
+(ert-deftest hbut-load-modifier-loads-file 553,18886
+(ert-deftest hbut-load-modifier-with-plain-file-loads-file-from-load-path 
565,19301
+(ert-deftest hbut-key-press-on-hyphen-in-elisp-symbol 574,19618
 
 test/hmouse-info-tests.el,189
 (ert-deftest hmouse-info-read-index-with-completion 25,561
@@ -2656,9 +2686,9 @@ test/hpath-tests.el,1363
 (defun hpath-tests--insert 225,8845
 (ert-deftest hpath:auto-variable-alist-org-folder-test 229,9019
 (ert-deftest hpath:auto-variable-alist-pythonpath-test 239,9481
-(ert-deftest hpath:remote-at-p 253,10072
-(ert-deftest hpath--at-p-checks-files-with-hash-in-name-exists 261,10377
-(ert-deftest 
hpath--at-p-checks-file-that-with-hash-that-does-not-exist-returns-nil 
278,11122
+(ert-deftest hpath:remote-at-p 253,10103
+(ert-deftest hpath--at-p-checks-files-with-hash-in-name-exists 261,10408
+(ert-deftest 
hpath--at-p-checks-file-that-with-hash-that-does-not-exist-returns-nil 
278,11153
 
 test/hsys-org-tests.el,591
 (ert-deftest hsys-org:cycle-on-header-cycles-visibility 25,541
@@ -2690,48 +2720,48 @@ test/hui-tests.el,2720
 (ert-deftest hui-ibut-label-create 87,3138
 (ert-deftest hui-ibut-label-create-fails-if-label-exists 96,3417
 (ert-deftest hui-ebut-create-link-to-directory 109,3887
-(ert-deftest hui-ebut-create-link-to-www-url 121,4434
-(ert-deftest 
hui-ebut-edit-link-to-www-url-keeping-all-values-should-not-modify-buffer-or-ebut
 131,4886
-(ert-deftest hui-ebut-use-region-as-label 146,5768
-(ert-deftest hui-ebut-www-link 160,6361
-(ert-deftest hui-ebut-create-exec-shell-cmd 172,6891
-(ert-deftest hui-ebut-create-link-to-info-index-using-completion 184,7465
-(ert-deftest hui-gibut-create-link-to-file 198,8186
-(ert-deftest hui-gibut-create-link-to-file-line 213,8848
-(ert-deftest hui-gibut-create-link-to-file-line-and-column 229,9588
-(ert-deftest hui-gibut-create-info-node 246,10392
-(ert-deftest hui--delimited-selectable-thing--in-cell-return-ref 261,11117
-(ert-deftest hui--delimited-selectable-thing--in-ibut-return-ibut-text 
272,11568
-(ert-deftest hui--delimited-selectable-thing--ibut-label-return-ibut-text 
283,11942
-(ert-deftest hui--delimited-selectable-thing--in-ebut-return-ebut-text 
294,12364
-(ert-deftest hui--delimited-selectable-thing--start-of-paired-delimiter 
305,12789
-(ert-deftest hui--delimited-selectable-thing--in-kcell-link-return-link 
317,13240
-(ert-deftest hui--kill-ring-save--yank-in-same-kotl 340,14072
-(ert-deftest hui--kill-ring-save--yank-in-other-kotl 361,14756
-(ert-deftest hui--kill-ring-save--yank-in-other-file 384,15593
-(ert-deftest hui--kill-ring-save--yank-in-other-file-other-dir 407,16416
-(ert-deftest hui--copy-to-register--yank-in-same-kotl 433,17354
-(ert-deftest hui--copy-to-register--yank-in-other-kotl 456,18162
-(ert-deftest hui--copy-to-register--yank-in-other-file 482,19140
-(ert-deftest hui--copy-to-register--yank-in-other-file-other-dir 507,20088
-(ert-deftest hui--kill-ring-save-in-kotl-mode-copies-region 535,21150
-(ert-deftest hui--kill-ring-save-in-kotl-mode-between-cells-fails 549,21667
-(ert-deftest hui--ibut-create-interactive 562,22156
-(ert-deftest hui--ibut-create-interactive-label-using-region 573,22591
-(ert-deftest hui--ibut-create-interactive-add-comment-char 587,23156
-(ert-deftest hui--ibut-create-interactive-create-label 600,23703
-(ert-deftest hui--ibut-rename-label-at-point 613,24203
-(ert-deftest hui--ibut-rename-label 627,24755
-(ert-deftest hui--ibut-rename-label-not-in-buffer-errors 640,25268
-(ert-deftest hui--ebut-rename 652,25708
-(ert-deftest hui--ebut-rename-only-button-with-that-label 660,26017
-(ert-deftest hui--ebut-rename-nonumbered-label 673,26592
-(ert-deftest hui--ebut-rename-numbered-label 686,27141
-(ert-deftest hui--ebut-rename-all-copies 699,27687
+(ert-deftest hui-ebut-create-link-to-www-url 121,4430
+(ert-deftest 
hui-ebut-edit-link-to-www-url-keeping-all-values-should-not-modify-buffer-or-ebut
 131,4882
+(ert-deftest hui-ebut-use-region-as-label 146,5764
+(ert-deftest hui-ebut-www-link 160,6357
+(ert-deftest hui-ebut-create-exec-shell-cmd 172,6883
+(ert-deftest hui-ebut-create-link-to-info-index-using-completion 184,7453
+(ert-deftest hui-gibut-create-link-to-file 198,8170
+(ert-deftest hui-gibut-create-link-to-file-line 213,8832
+(ert-deftest hui-gibut-create-link-to-file-line-and-column 229,9572
+(ert-deftest hui-gibut-create-info-node 246,10376
+(ert-deftest hui--delimited-selectable-thing--in-cell-return-ref 261,11101
+(ert-deftest hui--delimited-selectable-thing--in-ibut-return-ibut-text 
272,11552
+(ert-deftest hui--delimited-selectable-thing--ibut-label-return-ibut-text 
283,11926
+(ert-deftest hui--delimited-selectable-thing--in-ebut-return-ebut-text 
294,12348
+(ert-deftest hui--delimited-selectable-thing--start-of-paired-delimiter 
305,12773
+(ert-deftest hui--delimited-selectable-thing--in-kcell-link-return-link 
317,13224
+(ert-deftest hui--kill-ring-save--yank-in-same-kotl 340,14056
+(ert-deftest hui--kill-ring-save--yank-in-other-kotl 361,14740
+(ert-deftest hui--kill-ring-save--yank-in-other-file 384,15577
+(ert-deftest hui--kill-ring-save--yank-in-other-file-other-dir 407,16400
+(ert-deftest hui--copy-to-register--yank-in-same-kotl 433,17338
+(ert-deftest hui--copy-to-register--yank-in-other-kotl 456,18146
+(ert-deftest hui--copy-to-register--yank-in-other-file 482,19124
+(ert-deftest hui--copy-to-register--yank-in-other-file-other-dir 507,20072
+(ert-deftest hui--kill-ring-save-in-kotl-mode-copies-region 535,21134
+(ert-deftest hui--kill-ring-save-in-kotl-mode-between-cells-fails 549,21651
+(ert-deftest hui--ibut-create-interactive 562,22140
+(ert-deftest hui--ibut-create-interactive-label-using-region 573,22575
+(ert-deftest hui--ibut-create-interactive-add-comment-char 587,23140
+(ert-deftest hui--ibut-create-interactive-create-label 600,23687
+(ert-deftest hui--ibut-rename-label-at-point 613,24187
+(ert-deftest hui--ibut-rename-label 627,24739
+(ert-deftest hui--ibut-rename-label-not-in-buffer-errors 640,25252
+(ert-deftest hui--ebut-rename 652,25692
+(ert-deftest hui--ebut-rename-only-button-with-that-label 660,26001
+(ert-deftest hui--ebut-rename-nonumbered-label 673,26576
+(ert-deftest hui--ebut-rename-numbered-label 686,27125
+(ert-deftest hui--ebut-rename-all-copies 699,27671
 
 test/hypb-tests.el,88
 (ert-deftest hypb:installation-type-test 26,562
-(ert-deftest hypb--oct-to-int 68,2703
+(ert-deftest hypb--oct-to-int 68,2860
 
 test/hyperbole-tests.el,197
 (defun hyperbole-key-bindings 28,734
@@ -2752,9 +2782,9 @@ test/hyrolo-tests.el,570
 (ert-deftest hyrolo-sort-records-at-different-levels 234,7905
 
 test/kcell-tests.el,136
-(defconst kcell-tests--ref-to-id-tests31,787
-(defun kcell-tests--check-ref-to-id 71,1717
-(ert-deftest kcell-tests--ref-to-id 81,2070
+(defconst kcell-tests--ref-to-id-tests31,800
+(defun kcell-tests--check-ref-to-id 71,1730
+(ert-deftest kcell-tests--ref-to-id 81,2083
 
 test/kexport-tests.el,407
 (ert-deftest kexport:html-creates-html-file 26,633
@@ -2831,13 +2861,13 @@ test/smart-org-tests.el,851
 (ert-deftest smart-org-mode-on-header-cycles-visibility 29,716
 (ert-deftest smart-org-mode-with-smart-keys-on-delimited-thing-activates 
47,1375
 (ert-deftest smart-org-mode-with-smart-keys-on-hypb-button-activates 58,1721
-(ert-deftest smart-org-mode-with-smart-keys-buttons-on-hypb-button-activates 
68,2082
-(ert-deftest smart-org-mode-with-smart-keys-on-org-link-activates 78,2454
-(ert-deftest 
smart-org-mode-with-smart-keys-buttons-on-delimited-thing-calls-org-meta-return 
90,2810
-(ert-deftest smart-org-mode-with-smart-keys-buttons-on-org-link-activates 
102,3219
-(ert-deftest 
smart-org-mode-with-no-smart-keys-on-delimited-thing-calls-org-meta-return 
114,3601
-(ert-deftest 
smart-org-mode-with-no-smart-keys-on-hypb-button-calls-org-meta-return 127,4041
-(ert-deftest smart-org-mode-with-no-smart-keys-on-org-link-is-org-meta-return 
139,4402
+(ert-deftest smart-org-mode-with-smart-keys-buttons-on-hypb-button-activates 
70,2118
+(ert-deftest smart-org-mode-with-smart-keys-on-org-link-activates 81,2519
+(ert-deftest 
smart-org-mode-with-smart-keys-buttons-on-delimited-thing-calls-org-meta-return 
93,2875
+(ert-deftest smart-org-mode-with-smart-keys-buttons-on-org-link-activates 
105,3284
+(ert-deftest 
smart-org-mode-with-no-smart-keys-on-delimited-thing-calls-org-meta-return 
117,3666
+(ert-deftest 
smart-org-mode-with-no-smart-keys-on-hypb-button-calls-org-meta-return 130,4106
+(ert-deftest smart-org-mode-with-no-smart-keys-on-org-link-is-org-meta-return 
142,4467
 
 test/hy-test-dependencies.el,48
 (defun hy-test-ensure-package-installed 27,691
@@ -2845,8 +2875,8 @@ test/hy-test-dependencies.el,48
 test/hy-test-helpers.el,377
 (defun hy-test-helpers:consume-input-events 25,572
 (defun hy-test-helpers:should-last-message 30,793
-(defun hy-test-helpers:action-key-should-call-hpath:find 37,1042
-(defun hy-test-helpers:hypb-function-should-call-hpath:find 48,1556
-(defun hy-test-helpers:kill-buffer 57,1973
-(cl-defun hy-test-helpers-verify-hattr-at-p 62,2103
-(defun hy-delete-file-and-buffer 72,2575
+(defun hy-test-helpers:action-key-should-call-hpath:find 37,1044
+(defun hy-test-helpers:hypb-function-should-call-hpath:find 51,1622
+(defun hy-test-helpers:kill-buffer 60,2039
+(cl-defun hy-test-helpers-verify-hattr-at-p 65,2169
+(defun hy-delete-file-and-buffer 75,2641
diff --git a/hargs.el b/hargs.el
index 14af2baa9b..f1cbc90099 100644
--- a/hargs.el
+++ b/hargs.el
@@ -900,7 +900,7 @@ Hyperbole menu item help when appropriate."
    (?D . (directory .
                    (progn
                      (or default (setq default default-directory))
-                     (read-file-name prompt default default 'existing))))
+                     (read-directory-name prompt default default t))))
    ;; Get existing file name.
    (?f . (file .
               (read-file-name prompt default default
@@ -976,7 +976,8 @@ Hyperbole menu item help when appropriate."
    (?I . (Info-node . (progn (require 'info)
                             ;; Prevent empty completions list from
                             ;; triggering an error in Info-read-node-name.
-                            (unless Info-current-file-completions
+                            (unless (and Info-current-file-completions
+                                         (not (equal 
Info-current-file-completions '(("None")))))
                               (condition-case nil
                                   (Info-build-node-completions)
                                 (error (setq Info-current-file-completions 
'(("None"))))))
diff --git a/hbut.el b/hbut.el
index 20311e50d9..19d41b33a4 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    18-Sep-91 at 02:57:09
-;; Last-Mod:      7-Aug-23 at 22:31:45 by Bob Weiner
+;; Last-Mod:     23-Aug-23 at 22:25:52 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -947,8 +947,7 @@ Default is the symbol hbut:current."
                                (>= delim-text-end (point)))
                     (goto-char delim-text-start)
                     (skip-chars-forward "^-_a-zA-Z0-9"))
-                ;; Here handle when there is no name preceding the
-                ;; implicit button.
+                ;; Here handle when there is no name preceding the implicit 
button.
                 (unless (and (or (equal (hattr:get hbut 'loc) (current-buffer))
                                  (equal (hattr:get hbut 'loc) 
buffer-file-name))
                              delim-text-start delim-text-end
@@ -1373,9 +1372,10 @@ delimiters (REGEXP-MATCH is ignored in such cases).
 
 Any regexp given must have grouping 1 match the label.
 
-BUT-FUNC must take precisely three arguments: the button label, the
-start position of the delimited button label and its end position (positions
-include delimiters when INCLUDE-DELIMS is non-nil)."
+BUT-FUNC must take precisely three arguments: the button label,
+the start position of the delimited button label and its end
+position (positions include delimiters when INCLUDE-DELIMS is
+non-nil)."
   (unless start-delim
     (setq start-delim ebut:label-start))
   (unless end-delim
@@ -1650,8 +1650,11 @@ Any implicit button name must contain at least two 
characters,
 excluding delimiters, not just one."
   (interactive)
   (let* ((opoint (point-marker))
+        ;; Next line finds the name only if point is on it, not on the
+        ;; text of the button.
         (name-start-end (ibut:label-p t nil nil t t))
         (name       (nth 0 name-start-end))
+        (name-start (nth 1 name-start-end))
         (name-end   (nth 2 name-start-end))
         lbl-start-end
         lbl-start
@@ -1694,17 +1697,26 @@ excluding delimiters, not just one."
            ;; Point is within ibut text, not its name, so search
            ;; backward for any name on the same line.
            (goto-char lbl-start)
+           ;; Skip back past any likely opening delim preceding
+           ;; button text.
+           (skip-chars-backward "\"<{[| \t")
+           ;; Allow for looking back at any name separator space.
+           (skip-chars-forward " \t")
+           ;; Look back past any name separator.
            (when (looking-back ibut:label-separator-regexp
                                (line-beginning-position) t)
              ;; Move to within delimiters of name
              (goto-char (max (- (match-beginning 0) 3) (point-min)))
              (setq name-start-end (ibut:label-p t nil nil t t)
                    name           (nth 0 name-start-end)
+                   name-start     (nth 1 name-start-end)
                    name-end       (nth 2 name-start-end))))
 
-         (when (and lbl-start name-end)
+         (when name
            (hattr:set 'hbut:current 'name name))
-
+         (when (and name-start name-end)
+           (hattr:set 'hbut:current 'name-start name-start)
+           (hattr:set 'hbut:current 'name-end name-end))
          (when lbl-start
            (when (called-interactively-p 'any)
              (let (help-window-select)
@@ -1721,13 +1733,14 @@ If successful, return button instance num string or t 
for first
 instance; otherwise, return nil.  See `hbdata:ibut-instance' for
 details.
 
-If BUT-SYM is given, take buttons arguments from its property
+If BUT-SYM is given, take button's arguments from its property
 list.  Otherwise, button arguments can be given individually or
 if CATEG and following arguments are not given, create the button
 object from the implicit button at point, if any; in which case,
 return nil if no implicit button is found at point.
 
-Store new button attributes in the symbol, \\='hbut:current."
+If a new button is created, store its attributes in the symbol,
+\\='hbut:current."
   ;; :args is ignored unless :categ or :action is also given.
 
   ;; `lbl-key' attribute will be set from `but-sym' if any, the button
@@ -1741,7 +1754,7 @@ Store new button attributes in the symbol, 
\\='hbut:current."
         (types (htype:category 'ibtypes))
         ;; Global var used in (hact) function, don't delete.
         (hrule:action #'actype:identity)
-        (ibpoint (point-marker))
+        (opoint (point-marker))
         (itype)
         (is-type categ)
         (name-and-lbl-key-flag)
@@ -1751,8 +1764,10 @@ Store new button attributes in the symbol, 
\\='hbut:current."
     (unwind-protect
        (progn
          (unless but-sym
-           (hattr:clear 'hbut:current)
+           ;; (hattr:clear 'hbut:current) ;; Commented out since was causing 
ibut:at-p to fail.
+           ;; Set attributes of button at point, if any
            (setq name-and-lbl-key-flag (ibut:set-name-and-label-key-p))
+
            (when but-sym-flag
              (setq name-and-lbl-key-flag nil))
            ;; Since the Smart Keys handle end-of-line and end-of-buffer
@@ -1761,15 +1776,17 @@ Store new button attributes in the symbol, 
\\='hbut:current."
            ;; -- RSW, 02-16-2020 and 07-17-2022
            (unless (or is-type (eolp) (eobp))
              (unwind-protect
-                 (progn (setq text-start (or (hattr:get 'hbut:current 
'lbl-start)
-                                             (point))
-                              text-end (hattr:get 'hbut:current 'lbl-end))
-                        (unless (and (<= text-start (point))
+                 (progn (when (or but-sym-flag name-and-lbl-key-flag)
+                          (setq text-start (or (hattr:get 'hbut:current 
'lbl-start)
+                                               (point))
+                                text-end (hattr:get 'hbut:current 'lbl-end)))
+                        (unless (and text-start
+                                     (<= text-start (point))
                                      text-end
                                      (>= text-end (point)))
                           ;; Move to text of ibut before trying to activate it
                           ;; (may be on name)
-                          (goto-char (+ text-start 2)))
+                          (goto-char (+ (or text-start (point)) 2)))
                         (setq ibtype-point (point))
                         (while (and (not is-type) types)
                           (setq itype (car types))
@@ -1779,10 +1796,10 @@ Store new button attributes in the symbol, 
\\='hbut:current."
                             ;; unchanged.  Trigger an error if not.
                             (unless (equal (point) ibtype-point)
                               (hypb:error "(Hyperbole): `%s' at-p test 
improperly moved point from %s to %s"
-                                          is-type ibpoint (point-marker))))
+                                          is-type opoint (point-marker))))
                           (setq types (cdr types))))
-               (goto-char ibpoint)))
-           (set-marker ibpoint nil))
+               (goto-char opoint)))
+           (set-marker opoint nil))
 
          (when (or is-type but-sym)
            (unless but-sym
@@ -1892,7 +1909,7 @@ Store new button attributes in the symbol, 
\\='hbut:current."
                (hattr:set 'hbut:current 'args (if actype (cdr args) args))))
 
            (hbdata:ibut-instance-next (ibut:label-to-key name))))
-      (set-marker ibpoint nil))))
+      (set-marker opoint nil))))
 
 (def-edebug-spec cl-defun
  (&define name lambda-key-list
@@ -1910,31 +1927,48 @@ Store new button attributes in the symbol, 
\\='hbut:current."
 
 (defun    ibut:delete (&optional but-sym)
   "Delete Hyperbole implicit button based on optional BUT-SYM.
-Default is the symbol hbut:current'.
-Return symbol for button deleted or nil."
+If it is a named button, delete all occurrences in the buffer; otherwise, 
delete
+only if there is an occurrence at point.
+
+Default is the symbol \\='hbut:current.  Return symbol for button deleted or 
nil."
   (unless but-sym
     (setq but-sym 'hbut:current))
   (when (ibut:is-p but-sym)
-    (let ((loc     (hattr:get but-sym 'loc))
-         (start   (hattr:get but-sym 'lbl-start))
-         (end     (hattr:get but-sym 'lbl-end)))
-      (when (and start end)
-       (save-excursion
-         (with-current-buffer (if (bufferp loc) loc (find-file-noselect loc))
-           (when (ibut:to (ibut:key but-sym))
-             (let (buffer-read-only)
-               (if (< (point) start)
-                   ;; Find beginning of button named label delimiter and delete
-                   ;; from there.
-                   (progn (goto-char (- (point) (length ibut:label-start)))
-                          (delete-region (point) end))
-                 ;; No label, just delete delimited ibutton text.
-                 (delete-region start end))
-               (when (looking-at "[ \t]*\r?\n")
-                 (delete-region (point) (match-end 0)))
-               (run-hooks 'ibut-delete-hook)))))
+    (let ((name       (hattr:get but-sym 'name))
+         (name-start (hattr:get but-sym 'name-start))
+         (name-end   (hattr:get but-sym 'name-end))
+         (loc        (hattr:get but-sym 'loc))
+         (lbl-key    (hattr:get but-sym 'lbl-key))
+         (lbl-start  (hattr:get but-sym 'lbl-start))
+         (lbl-end    (hattr:get but-sym 'lbl-end)))
+      (when (and lbl-start lbl-end)
+       (with-current-buffer (if (bufferp loc) loc (find-file-noselect loc))
+         (barf-if-buffer-read-only)
+         (save-excursion
+           (if name
+               (ibut:map
+                (lambda (name start end)
+                  (goto-char (+ start 2))
+                  (when (ibut:set-name-and-label-key-p)
+                    (ibut:delete-occurrence
+                     (hattr:get but-sym 'name-start)
+                     (hattr:get but-sym 'lbl-end))))
+                (ibut:label-instances-regexp (ibut:label-to-key name))
+                t)
+             (ibut:delete-occurrence lbl-start lbl-end)))
+         ;; Also delete in-memory version of the ibut
+         (hattr:clear but-sym))
        but-sym))))
 
+(defun    ibut:delete-occurrence (start end)
+  "Delete Hyperbole implicit button between START and END.
+Assume caller has checked that there is an implicit button at point and
+has saved any original point to which to return."
+  (goto-char start)
+  (delete-region start end)
+  (just-one-space)
+  (run-hooks 'ibut-delete-hook))
+
 (defun    ibut:delimit (start end instance-flag)
   "Delimit implicit button name spanning region START to END in current buffer.
 If button is already delimited or delimit fails, return nil, else t.
@@ -2018,16 +2052,16 @@ first encountered."
          (ibut:label-instances-regexp name-key))))
 
 (defun    ibut:label-p (&optional as-label start-delim end-delim pos-flag 
two-lines-flag)
-  "Return key for the implicit button label that point is within, else nil.
+  "Return key for the implicit button name that point is within, else nil.
 
-This is the normalized key form of an optional name that may precede an
-implicit button (when the start and end delimiters are not given as
-arguments).  If delimiters are given as arguments, return the key form
-of the implicit button text at point between those delimiters.
+Without the start and end delimiter arguments, this is the normalized
+key form of the optional name that may precede an implicit button.
+If the delimiter arguments are given, return the key form of the
+implicit button text at point between those delimiters.  Assume point is
+within the first line of any button.
 
-Use `ibut:at-p' instead to test if point is on either the
-implicit button text itself or the name. Assume point is within the
-first line of any button.
+Use `ibut:at-p' instead to test if point is on either the implicit
+button text itself or the name.
 
 All following arguments are optional.  If AS-LABEL is non-nil, label is
 returned rather than the key derived from the label.  START-DELIM and
@@ -2140,7 +2174,7 @@ positions at which the button label delimiter begins and 
ends."
       (if loc-p buts (when buts (apply #'set:create buts))))))
 
 (defun    ibut:key (ibut)
-  "Return the key for Hyperbole implicit button symbol IBUT."
+  "Return the text key for Hyperbole implicit button symbol IBUT."
   (if (ibut:is-p ibut)
       (hattr:get ibut 'lbl-key)
     (error "(ibut:key): Argument is not a Hyperbole implicit button symbol, 
`%s'"
@@ -2157,8 +2191,8 @@ positions at which the button label delimiter begins and 
ends."
 If REGEXP-MATCH is non-nil, only buttons which match this argument
 are considered.
 
-BUT-FUNC must take precisely three arguments: the button label,
-the start position of the delimited button label and its end
+BUT-FUNC must take precisely three arguments: the button name,
+the start position of the delimited button name and its end
 position (positions include delimiters when INCLUDE-DELIMS is
 non-nil)."
   (hbut:map but-func ibut:label-start ibut:label-end regexp-match 
include-delims))
@@ -2201,31 +2235,29 @@ Summary of operations based on inputs (name arg comes 
from \\='hbut:current attr
 
|----+------+----------+--------+------+-----------------------------------------------|
 |  # | name | new-name | region | edit | operation                             
        |
 
|----+------+----------+--------+------+-----------------------------------------------|
-|* 1 | nil  | nil      | nil    | nil  | create: unnamed ibut from 
hbut:current attrs  |
+|  1 | nil  | nil      | nil    | nil  | create: unnamed ibut from 
hbut:current attrs  |
 |  2 | nil  | new-name | nil    | nil  | ERROR: edit-flag must be t to set 
new-name    |
-|* 3 | name | nil      | nil    | nil  | create: ibut with name                
        |
-|* 4 | name | new-name | nil    | nil  | ERROR: create can't have name and 
new-name    |
-|* 5 | name | new-name | region | nil  | ERROR: create can't have name and 
new-name    |
+|  3 | name | nil      | nil    | nil  | create: ibut with name                
        |
+|  4 | name | new-name | nil    | nil  | ERROR: create can't have name and 
new-name    |
+|  5 | name | new-name | region | nil  | ERROR: create can't have name and 
new-name    |
 |  6 | name | nil      | region | nil  | create: ibut with name (ignore 
region)        |
-|* 7 | nil  | nil      | region | nil  | create: region named ibut             
        |
+|  7 | nil  | nil      | region | nil  | create: region named ibut             
        |
 |  8 | nil  | new-name | region | nil  | ERROR: edit-flag must be t to set 
new-name    |
 
|----+------+----------+--------+------+-----------------------------------------------|
-|* 9 | nil  | nil      | nil    | t    | mod: remove any name from ibut        
        |
-|*10 | nil  | new-name | nil    | t    | mod: add new-name as ibut's name 
attribute    |
-|*11 | name | nil      | nil    | t    | mod: name of ibut from hbut:current 
attrs     |
-|*12 | name | new-name | nil    | t    | mod: rename ibut with name to 
new-name        |
+|  9 | nil  | nil      | nil    | t    | mod: remove any name from ibut        
        |
+| 10 | nil  | new-name | nil    | t    | mod: add new-name as ibut's name 
attribute    |
+| 11 | name | nil      | nil    | t    | mod: name of ibut from hbut:current 
attrs     |
+| 12 | name | new-name | nil    | t    | mod: rename ibut with name to 
new-name        |
 | 13 | name | new-name | region | t    | ERROR: Can't use region to mod 
existing ibut  |
 | 14 | name | nil      | region | t    | ERROR: Can't use region to mod 
existing ibut  |
 | 15 | nil  | nil      | region | t    | ERROR: Can't use region to mod 
existing ibut  |
 | 16 | nil  | new-name | region | t    | ERROR: Can't use region to mod 
existing ibut  |
 
|----+------+----------+--------+------+-----------------------------------------------|"
-  (let* ((actype (hattr:get 'hbut:current 'actype))
-        (name (hattr:get 'hbut:current 'name))
+  (barf-if-buffer-read-only)
+  (let* ((name (hattr:get 'hbut:current 'name))
         (name-regexp (ibut:label-regexp (ibut:label-to-key name)))
         (region-flag (hmouse-use-region-p))
         (instance-flag))
-    (unless actype
-      (hypb:error "(ibut:operate): hbut:current actype must be non-nil"))
     (when (and new-name (or (not (stringp new-name)) (string-empty-p 
new-name)))
       (hypb:error "(ibut:operate): 'new-name' value must be a non-empty 
string, not: '%s'"
                  new-name))
@@ -2237,7 +2269,8 @@ Summary of operations based on inputs (name arg comes 
from \\='hbut:current attr
       (hypb:error "(ibut:operate): 'edit-flag' must be nil when region is 
highlighted to use region as new button name"))
 
     (unless new-name
-      (setq new-name name))
+      (setq new-name name
+           name nil))
     (when (stringp new-name)
       (hattr:set 'hbut:current 'name new-name))
     (save-excursion
@@ -2267,57 +2300,49 @@ Summary of operations based on inputs (name arg comes 
from \\='hbut:current attr
                      (cond ((ibut:map
                              (lambda (_lbl start end)
                                (delete-region start end)
-                               (ibut:delimit
-                                (point)
-                                (progn (insert new-name) (point))
-                                instance-flag))
+                               (when new-name
+                                 (ibut:delimit
+                                  (point)
+                                  (progn (insert new-name) (point))
+                                  instance-flag)))
                              name-regexp 'include-delims))
                            (at-but))))
                   (new-name
                    ;; Add new-name to nameless button at point
                    (goto-char (or (hattr:get 'hbut:current 'lbl-start) 
(point)))
+                   ;; Skip back past any likely opening delim preceding button 
text.
+                   (skip-chars-backward "\"<{[|")
                    (ibut:delimit (point)
                                  (progn (insert new-name) (point))
-                                 instance-flag))))
-
-           (instance-flag
-            ;; Above flag is 't when there is exactly one existing
-            ;; instance of the button name
+                                 instance-flag))
+                  (t ;; Remove any existing name at point
+                   (when (hattr:get 'hbut:current 'name-start)
+                     (save-excursion
+                       (delete-region (goto-char (hattr:get 'hbut:current 
'name-start))
+                                      (hattr:get 'hbut:current 'name-end))
+                       (when (looking-at ibut:label-separator-regexp)
+                         (delete-region (match-beginning 0) (match-end 
0))))))))
+           (t
+            ;; Above flag is 't when we are creating the first instance
+            ;; of the button name
             ;;
             ;; Add a new implicit button in the buffer, recording its
             ;; start and end positions; new-name is always nil here
-            (cond ((not (or name region-flag))
+            (cond ((not (or name new-name region-flag))
                    ;; No name to insert, just insert ibutton text below
                    )
                   ((and region-flag
                         ;; ignore region when name or new-name are set
                         (not (or name new-name))
                         ;; new-name is always nil here
-                        (if (hyperb:stack-frame
-                             '(hui:ebut-create hui:ebut-edit 
hui:ebut-edit-region
-                                               hui:ebut-link-create 
hui:gbut-create
-                                                       hui:gbut-edit 
hui:link-create ebut:program
-                                               hui:ibut-create hui:ibut-edit
-                                               hui:ibut-link-create 
ibut:program))
-                            ;; Ignore action-key-depress-prev-point
-                            (setq start (region-beginning)
-                                  end (region-end)
-                                  name (buffer-substring-no-properties start 
end))
-                          ;; Utilize any action-key-depress-prev-point
-                          (setq mark (marker-position (mark-marker))
-                                prev-point (and action-key-depress-prev-point
-                                                (marker-position 
action-key-depress-prev-point))
-                                start (if (and prev-point mark (<= prev-point 
mark))
-                                          prev-point
-                                        (region-beginning))
-                                end (if (and prev-point mark (> prev-point 
mark))
-                                        prev-point
-                                      (region-end))
-                                name (buffer-substring-no-properties start 
end))))
+                        ;; Ignore action-key-depress-prev-point
+                        (setq start (region-beginning)
+                              end (region-end)
+                              name (buffer-substring-no-properties start end)))
                    nil)
                   ((progn (when start (goto-char start))
-                          (or (when name  (looking-at (regexp-quote name)))
-                              (when new-name  (looking-at (regexp-quote 
new-name)))))
+                          (or (when name (looking-at (regexp-quote name)))
+                              (when new-name (looking-at (regexp-quote 
new-name)))))
                    (setq start (point)
                          end (match-end 0)))
                   (name
@@ -2327,23 +2352,36 @@ Summary of operations based on inputs (name arg comes 
from \\='hbut:current attr
                   (new-name
                    (setq start (point))
                    (insert new-name)
-                   (setq end (point)))))
-           (t (hypb:error
-               "(ibut:operate): Operation failed.  Check button attribute 
permissions: %s"
-               hattr:filename)))
+                   (setq end (point)))
+                  (t (hypb:error
+                      "(ibut:operate): Operation failed.  Check button 
attribute permissions: %s"
+                      hattr:filename)))))
 
       (unless edit-flag
        (when (and start end)
          (ibut:delimit start end instance-flag))
-       (ibut:insert-text 'hbut:current)
-       (if start
-           (goto-char start)
-         (goto-char (max (- (point) 2) (point-min))))))
-
-    ;; Append any instance-flag string to the button name
-    (when (stringp instance-flag)
-      (setq new-name (concat new-name instance-flag))
-      (hattr:set 'hbut:current 'name new-name))
+       (when (hattr:get 'hbut:current 'actype)
+         (ibut:insert-text 'hbut:current)))
+
+      (goto-char (or start (max (- (point) 2) (point-min))))
+      ;; Skip past any inserted comment char
+      (skip-syntax-forward "-<")
+      ;; Skip past any name or label opening delim chars
+      (skip-chars-forward "\"<{[| \t\n\r"))
+
+    ;; Set all in-memory hbut attributes for any button at point
+    (ibut:at-p)
+
+    (let ((lbl-key (hattr:get 'hbut:current 'lbl-key)))
+      ;; (unless lbl-key
+      ;;       (when (or (and (ibut:set-name-and-label-key-p)
+      ;;                      (hattr:get 'hbut:current 'lbl-key))
+      ;;                 (ibut:at-p)) ;; Sets lbl-key for non-delimited ibtypes
+      ;;         (setq lbl-key (hattr:get 'hbut:current 'lbl-key))))
+      (unless (and (stringp lbl-key) (not (string-empty-p lbl-key)))
+       (hypb:error "(ibut:operate): hbut:current lbl-key must be non-nil")))
+
+    (run-hooks (if edit-flag 'ibut-edit-hook 'ibut-create-hook))
 
     ;; Position point
     (let ((new-key (ibut:label-to-key new-name)))
@@ -2359,22 +2397,11 @@ Summary of operations based on inputs (name arg comes 
from \\='hbut:current attr
                   (re-search-backward regexp nil t)))
             (goto-char (+ (match-beginning 0) (length ibut:label-start))))))
 
-    (let ((lbl-key (hattr:get 'hbut:current 'lbl-key)))
-      (unless lbl-key
-       (when (or (and (ibut:set-name-and-label-key-p)
-                      (hattr:get 'hbut:current 'lbl-key))
-                 (ibut:at-p)) ;; Sets lbl-key for non-delimited ibtypes
-         (setq lbl-key (hattr:get 'hbut:current 'lbl-key))))
-      (unless (and (stringp lbl-key) (not (string-empty-p lbl-key)))
-       (hypb:error "(ibut:operate): hbut:current lbl-key must be non-nil")))
-
-    (run-hooks (if edit-flag 'ibut-edit-hook 'ibut-create-hook))
-
     ;; instance-flag might be 't which we don't want to return.
     (when (stringp instance-flag) instance-flag)))
 
 (defun    ibut:insert-text (ibut)
-  "Space, delimit and insert the activatable text of IBUT."
+  "Space, delimit and insert the text part of IBUT."
   (cond ((looking-at ibut:label-separator-regexp)
         (goto-char (match-end 0)))
        ((not (or (string-empty-p (or (hattr:get ibut 'name) ""))))
@@ -2487,12 +2514,13 @@ For interactive creation, use `hui:ibut-create' 
instead."
     ;; cannot create another button within such contexts.
     (when ibut
       (let ((name (hattr:get ibut 'name))
+           (name-start (hattr:get ibut 'name-start))
            (lbl (hbut:key-to-label (hattr:get ibut 'lbl-key)))
            (lbl-start (hattr:get ibut 'lbl-start))
            (lbl-end (hattr:get ibut 'lbl-end)))
        (when (or name lbl (and lbl-start lbl-end))
          (error "(ibut:program): Cannot nest an ibut within the existing 
button: '%s'"
-                (or name lbl (buffer-substring-no-properties lbl-start 
lbl-end))))))
+                (or name lbl (buffer-substring-no-properties (or name-start 
lbl-start) lbl-end))))))
 
     (save-excursion
       (let ((but-buf (current-buffer))
@@ -2516,11 +2544,12 @@ For interactive creation, use `hui:ibut-create' 
instead."
   "Change an implicit button name in the current buffer from OLD-LBL to 
NEW-LBL.
 Return t if the label is changed, else nil.
 
-Signal an error when no such button is found in the current buffer.
+Signal an error when no such button is found in the current buffer or if either
+OLD-LBL or NEW-LBL is empty.
 
 Leave point at the start of the button label which may be elsewhere
 than the current point; callers should use `save-excursion` to retain
-current."
+the existing point."
   (cond ((or (not (stringp new-lbl)) (< (length new-lbl) 1))
         (error "(ibut:rename): Invalid 'new-lbl' argument: \"%s\"" new-lbl))
        ((or (not (stringp old-lbl)) (< (length old-lbl) 1))
@@ -2529,6 +2558,7 @@ current."
          (unless (string-equal old-lbl new-lbl)
           (delete-region (point) (search-forward ibut:label-end nil t))
           (save-excursion (insert new-lbl ibut:label-end))
+          (hattr:clear 'hbut:current)
            t))
        (t (error "(ibut:rename): Button '%s' not found in visible portion of 
buffer." old-lbl))))
 
@@ -2536,9 +2566,10 @@ current."
 
 (defun    ibut:to (name-key)
   "Find the nearest implicit button with NAME-KEY (a name or name key).
-Find within the visible portion of the current buffer.
-Leave point inside the button text or its optional name, if it has one.
-Return the symbol for the button, else nil."
+Find within the visible portion of the current buffer.  Leave
+point at the start of the button text or its optional name, if it
+has one (excluding delimiters).  Return the symbol for the
+button, else nil."
   (unless name-key
     (setq name-key (ibut:label-p nil nil nil nil t)))
   (hbut:funcall (lambda (name-key _buffer _key-src)
@@ -2546,7 +2577,7 @@ Return the symbol for the button, else nil."
                    ;; Handle a name given rather than a name key
                    (when (string-match-p "\\s-" name-key)
                      (setq name-key (ibut:label-to-key name-key)))
-                   (let ((regexp (hbut:label-regexp name-key t))
+                   (let ((regexp (ibut:label-regexp name-key t))
                          (start (point))
                          at-name-key
                          ibut
@@ -2565,7 +2596,7 @@ Return the symbol for the button, else nil."
                                ;; character to prevent this.
                                found (save-excursion
                                        (goto-char (1- (point)))
-                                       (setq ibut (ibut:at-p)
+                                       (setq ibut 'hbut:current
                                              at-name-key (ibut:label-to-key
                                                           (hattr:get ibut 
'name)))
                                        (equal at-name-key name-key))))
@@ -2574,7 +2605,7 @@ Return the symbol for the button, else nil."
                        ;; re-search backward
                        (while (and (not found) (re-search-backward regexp nil 
t))
                          (setq pos (match-beginning 0)
-                               ibut (ibut:at-p)
+                               ibut 'hbut:current
                                at-name-key (ibut:label-to-key
                                             (hattr:get ibut 'name))
                                found (equal at-name-key name-key))))
@@ -2647,8 +2678,8 @@ Find the nearest implicit button with NAME-KEY (a name or 
name key)
 within the visible portion of the current buffer and move to within
 its button text.  This will find an implicit button if point is
 within its name or text or if NAME-KEY is a name/name-key of an
-existing implicit button.  It will not find other unnamed
-implicit buttons.
+existing implicit button.  It will not find other unnamed implicit
+buttons.
 
 Return the symbol for the button if found, else nil."
   (unless name-key
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 39c20ef167..11ead6bc01 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    04-Feb-90
-;; Last-Mod:     30-Jul-23 at 10:06:29 by Bob Weiner
+;; Last-Mod:     12-Aug-23 at 13:19:18 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1122,11 +1122,8 @@ documentation is found."
                            (attributes (nthcdr 2 (hattr:list 'hbut:current))))
                        (princ (format "%s %s BUTTON SPECIFICS:\n"
                                       (htype:def-symbol
-                                       (if (eq categ 'explicit)
-                                           actype
-                                         categ))
-                                      (if (eq categ 'explicit)
-                                          "EXPLICIT" "IMPLICIT")))
+                                       (if (eq categ 'explicit) actype categ))
+                                      (if (eq categ 'explicit) "EXPLICIT" 
"IMPLICIT")))
                        (hattr:report attributes)
                        (unless (or (eq categ 'explicit)
                                    (null categ)
diff --git a/hmouse-tag.el b/hmouse-tag.el
index 690e6cb784..90de0e53bc 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -758,7 +758,7 @@ Return matching Elisp tag name that point is within, else 
nil."
 Return nil when point is on the first line of a non-alias Lisp definition.
 
 Resolve Hyperbole implicit button type and action type references."
-  (smart-lisp-htype-tag 
+  (smart-lisp-htype-tag
    (smart-lisp-at-non-htype-tag-p no-flash)))
 
 (defun smart-lisp-at-non-htype-tag-p (&optional no-flash)
diff --git a/hui.el b/hui.el
index dfa7552e9b..5d43c3a037 100644
--- a/hui.el
+++ b/hui.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 21:42:03
-;; Last-Mod:     17-Jul-23 at 00:21:28 by Bob Weiner
+;; Last-Mod:     25-Aug-23 at 10:36:13 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -638,7 +638,7 @@ details."
                    (when (hattr:get 'hbut:current 'lbl-end)
                       (let* ((start (hattr:get 'hbut:current 'lbl-start))
                              (end (hattr:get 'hbut:current 'lbl-end))
-                             (old-text (buffer-substring start end))
+                             (old-text (buffer-substring-no-properties start 
end))
                              (new-text (read-string "Edit ibut text: " 
old-text)))
                        (save-excursion
                          (goto-char start)
@@ -731,8 +731,8 @@ Use `hui:gbut-create' to create a global explicit button."
 
 (defun hui:hbut-act (&optional but)
   "Execute action for optional Hyperbole button symbol BUT in current buffer.
-         The default is the current button."
-  (interactive (list (hbut:get (hargs:read-match "Activate labeled Hyperbole 
button: "
+The default is the current button."
+  (interactive (list (hbut:get (hargs:read-match "Activate named Hyperbole 
button: "
                                                 (nconc (ebut:alist) 
(ibut:alist))
                                                 nil t nil 'hbut))))
   (hui:hbut-operate #'hbut:act "Activate Hyperbole button: " but))
@@ -774,6 +774,8 @@ Use `hui:gbut-create' to create a global explicit button."
 
 (defun hui:hbut-delete (&optional but-key key-src)
   "Delete a Hyperbole button given by optional BUT-KEY in optional KEY-SRC.
+For an implicit button, the BUT-KEY is the text key, not the name key.
+
 Use current buffer if no KEY-SRC is given.  Return t if button
 is deleted, nil if user chooses not to delete, or signal an error
 otherwise.  If called interactively, prompt user for whether to
@@ -904,7 +906,7 @@ See `hbut:report'."
 (defalias 'hui:hbut-summarize #'hui:hbut-report)
 
 (defun hui:ibut-act (&optional ibut)
-  "Activate optional labeled implicit button symbol IBUT in current buffer.
+  "Activate optional named implicit button symbol IBUT in current buffer.
 Default is any implicit button at point."
   (interactive
    (let ((ibut (ibut:at-p)) (lst))
@@ -912,17 +914,17 @@ Default is any implicit button at point."
       (cond (ibut)
            ((setq lst (ibut:alist))
             (ibut:get (ibut:label-to-key
-                       (hargs:read-match "Activate labeled implicit button: " 
lst nil t
+                       (hargs:read-match "Activate named implicit button: " 
lst nil t
                                          (ibut:label-p 'as-label) 'ibut))))
            (t
-            (hypb:error "(ibut-act): No labeled implicit buttons in 
buffer."))))))
-  (hui:hbut-operate #'ibut:act "Activate labeled implicit button: " ibut))
+            (hypb:error "(ibut-act): No named implicit buttons in 
buffer."))))))
+  (hui:hbut-operate #'ibut:act "Activate named implicit button: " ibut))
 
 (defun hui:ibut-create (&optional start end)
   "Interactively create an implicit Hyperbole button at point.
-Use any label between optional START and END points (when interactive,
+Use any name between optional START and END points (when interactive,
 any active region).  Indicate button creation by delimiting
-and adding any necessary instance number to the button label.
+and adding any necessary instance number to the button name.
 
 For programmatic creation, use `ibut:program' instead."
   (interactive (list (when (use-region-p) (region-beginning))
@@ -1524,10 +1526,28 @@ for with completion of all labeled buttons within the 
current buffer."
         (hypb:error "(hbut-operate): No current button upon which to 
operate."))
        ((progn (unless but (setq but 'hbut:current))
                (hbut:is-p but))
-        (hui:but-flash)
-        (apply hrule:action
-               operation
-               `(',but)))
+        ;; Temporarily move point to start of the button text for flashing and 
activation.
+        ;; Only if the button action does not move point, restore point to it 
previous value.
+        (let ((opoint (point-marker))
+              (text-start (hattr:get but 'lbl-start)))
+          (if text-start
+              (goto-char text-start)
+            (ibut:to-text (hattr:get but 'lbl-key)))
+          (setq text-start (point-marker))
+          (hui:but-flash)
+          (prog1 (apply hrule:action operation `(',but))
+            ;; Restore point as it was prior to `text-start' move
+            ;; if the action switched buffers or did not move point
+            ;; within the current buffer.
+            (when (or (equal text-start (point-marker))
+                      (not (eq (current-buffer) (marker-buffer opoint))))
+              (with-current-buffer (marker-buffer opoint)
+                (let ((owind (get-buffer-window nil t)))
+                  (if owind
+                      (set-window-point owind opoint)
+                    (goto-char opoint)))))
+            (set-marker opoint nil)
+            (set-marker text-start nil))))
        ((and but (symbolp but))
         (hypb:error "(hbut-operate): Symbol, %s, has invalid Hyperbole button 
attributes:\n  %S" but (hattr:list but)))
        (t
@@ -1632,7 +1652,9 @@ Optional NO-SORT means display in decreasing priority 
order (natural order)."
     (hui:htype-help htype-sym no-sort)))
 
 (defun hui:ibut-delete-op (interactive but-key key-src)
-  "INTERACTIVEly or not, delete explicit button given by BUT-KEY in KEY-SRC.
+  "INTERACTIVEly or not, delete implicit button given by BUT-KEY in KEY-SRC.
+The BUT-KEY is the text key, not the name key.
+
 KEY-SRC may be a buffer or a pathname; when nil the current buffer is used.
 Return t if button is deleted, signal error otherwise.  If called
 with INTERACTIVE non-nil, derive BUT-KEY from the button that point is
diff --git a/hycontrol.el b/hycontrol.el
index 0546a9306d..5bf8ab772a 100644
--- a/hycontrol.el
+++ b/hycontrol.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     1-Jun-16 at 15:35:36
-;; Last-Mod:     10-Jul-23 at 17:42:24 by Mats Lidell
+;; Last-Mod:     23-Aug-23 at 15:09:00 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -1898,8 +1898,8 @@ See documentation of `hycontrol-windows-grid' for further 
details."
               ;; to 1 if there was no error.
               (setq hycontrol-arg 1))
       (error (set-window-configuration wconfig)
-            (if (and hycontrol-help-flag (or hycontrol-frames-mode 
hycontrol-windows-mode))
-                (pop-to-buffer "*Messages*"))
+            (and hycontrol-help-flag (or hycontrol-frames-mode 
hycontrol-windows-mode)
+                (pop-to-buffer (messages-buffer)))
             (error "(HyDebug): Grid Size: %d; %s" arg err)))
     ;; No error, save prior frame configuration for easy return
     (hhist:add hist-elt)
diff --git a/hypb-ert.el b/hypb-ert.el
index 50d860df9e..759ea5e37f 100644
--- a/hypb-ert.el
+++ b/hypb-ert.el
@@ -78,7 +78,7 @@
 ;; instrumented by edebug:
 ;; (memq 'edebug-enter (flatten-tree (ert-test-body (ert-get-test test-sym))))
 
-(defun hypb-ert-def-at-p ()
+(defun hypb-ert-def-at-p (&optional start-end-flag)
   "Return test name if on the name in the first line of an ert test def."
   (unless (or (eolp)
              (memq (char-after (point))
@@ -88,7 +88,9 @@
       (when (looking-at (concat "(ert-deftest[ \t]+\\("
                                lisp-mode-symbol-regexp
                                "\\)[ \t]+("))
-       (match-string-no-properties 1)))))
+       (if start-end-flag
+           (list (match-string-no-properties 1) (match-beginning 1) (match-end 
1))
+         (match-string-no-properties 1))))))
 
 (defun hypb-ert-run-test-at-definition (test-name &optional debug-it)
   "Assume on the name in the first line of an ert test def, eval and run the 
test.
@@ -111,9 +113,10 @@ test when it is run."
 (defib hyperbole-run-test-definition ()
   "If on the name in the first line of an ert test def, eval and run the test.
 With an Assist Key press instead, edebug the test and step through it."
-  (let ((test-name (hypb-ert-def-at-p)))
-    (when test-name
-      (hact 'hypb-ert-run-test-at-definition test-name))))
+  (let ((test-name-and-positions (hypb-ert-def-at-p t)))
+    (when test-name-and-positions
+      (apply #'ibut:label-set test-name-and-positions)
+      (hact 'hypb-ert-run-test-at-definition (car test-name-and-positions)))))
 
 (defun hyperbole-run-test-definition:help (_hbut)
   "If on the name in the first line of an ert test def, edebug the test."
diff --git a/hypb.el b/hypb.el
index e617a0b0c3..d1cfd2fb36 100644
--- a/hypb.el
+++ b/hypb.el
@@ -297,9 +297,9 @@ Use optional OUT-BUF if present, else the current buffer."
           (insert (format "\tInstall:     %s, %s" (car install-type) (cadr 
install-type)))))
       (insert "\n")
       ;; Insert recent Hyperbole debugging messages if any.
-      (when (get-buffer "*Messages*")
+      (when (messages-buffer)
        (let ((opoint (point)))
-         (insert-buffer-substring "*Messages*")
+         (insert-buffer-substring (buffer-name (messages-buffer)))
          (keep-lines "^(HyDebug)" opoint (point))))
       (untabify start (point)))))
 
diff --git a/kotl/klink.el b/kotl/klink.el
index 77a3fa9397..a3fb6eb7de 100644
--- a/kotl/klink.el
+++ b/kotl/klink.el
@@ -199,8 +199,8 @@ link-end-position, (including delimiters)."
                 (hpath:is-p (expand-file-name referent (hbut:get-key-src t 
t)))))
           ;; Eliminate matches to e-mail addresses like, <user@domain>
           (not (string-match "[^<> \t\n\r\f][!&@]" referent))
-          ;; Eliminate matches to URLs
-          (not (string-match "\\`[a-zA-Z]+:" referent))
+          ;; Eliminate matches to URLs but allow for single char Windows path 
drive prefixes
+          (not (string-match "\\`[a-zA-Z][a-zA-Z]+:" referent))
           ;; Don't match to <HTML> and </SGML> type tags
           (not (and (memq major-mode hui-select-markup-modes)
                     ;; Assume , followed by a number is a klink.
diff --git a/test/hbut-tests.el b/test/hbut-tests.el
index 48d533bbd7..f969ec9000 100644
--- a/test/hbut-tests.el
+++ b/test/hbut-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    30-may-21 at 09:33:00
-;; Last-Mod:     17-Jul-23 at 00:29:14 by Bob Weiner
+;; Last-Mod:     19-Aug-23 at 01:12:57 by Bob Weiner
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -153,7 +153,8 @@ Needed since hyperbole expands all links to absolute paths 
and
             (mock (hpath:find-noselect (expand-file-name hbmap:filename 
hbmap:dir-user)) => test-buffer)
             (gbut:ebut-program "global" 'link-to-file-line-and-column 
test-file 10 20))
          (with-current-buffer test-buffer
-            (hy-test-helpers-verify-hattr-at-p :actype 
'actypes::link-to-file-line-and-column :args (list test-file 10 20) :loc 
test-file :lbl-key"global")))
+            (hy-test-helpers-verify-hattr-at-p :actype 
'actypes::link-to-file-line-and-column
+                                              :args (list test-file 10 20) 
:loc test-file :lbl-key "global")))
       (hy-delete-file-and-buffer test-file))))
 
 (ert-deftest hypb:program-create-ebut-in-buffer ()
@@ -194,25 +195,25 @@ Needed since hyperbole expands all links to absolute 
paths and
 (ert-deftest hbut-tests-ibut-program-link-to-directory ()
   "Programmatically create ibut link-to-directory."
   (with-temp-buffer
-    (ibut:program "label" 'link-to-directory "/tmp")
-    (should (string= "<[label]> - \"/tmp\"" (buffer-string)))))
+    (ibut:program "name" 'link-to-directory "/tmp")
+    (should (string= "<[name]> - \"/tmp\"" (buffer-string)))))
 
 (ert-deftest hbut-tests-ibut-program-link-to-file ()
   "Programatically create ibut link to file."
   (let ((test-file (make-temp-file "ibut" nil ".txt")))
     (unwind-protect
         (with-temp-buffer
-          (ibut:program "label" 'link-to-file test-file)
+          (ibut:program "name" 'link-to-file test-file)
           (should (string=
-                   (concat "<[label]> - \"" test-file "\"")
+                   (concat "<[name]> - \"" test-file "\"")
                    (buffer-string))))
       (delete-file test-file))))
 
 (ert-deftest hbut-tests-ibut-insert-text-link-to-dir ()
   "Insert link to dir."
   (with-temp-buffer
-    (ibut:program "label" 'link-to-directory "/tmp")
-    (should (string= "<[label]> - \"/tmp\"" (buffer-string)))
+    (ibut:program "name" 'link-to-directory "/tmp")
+    (should (string= "<[name]> - \"/tmp\"" (buffer-string)))
     (goto-char 3)
     (let ((but (ibut:at-p)))
       (with-temp-buffer
@@ -228,9 +229,9 @@ Needed since hyperbole expands all links to absolute paths 
and
         (progn
          ;; Test with name
           (setq annot-bib-buf (find-file annot-bib-file))
-         (ibut:program "label" 'annot-bib "arg")
+         (ibut:program "name" 'annot-bib "arg")
          (save-buffer)
-         (should (string-match (concat (regexp-quote "<[label]> - [arg]")
+         (should (string-match (concat (regexp-quote "<[name]> - [arg]")
                                        "\\s-*")
                                (buffer-string)))
          ;; Test without name
@@ -251,9 +252,9 @@ Needed since hyperbole expands all links to absolute paths 
and
         (progn
          ;; Test with name
           (setq kbd-key-buf (find-file kbd-key-file))
-         (ibut:program "label" 'kbd-key "{ C-f C-f }")
+         (ibut:program "name" 'kbd-key "{ C-f C-f }")
          (save-buffer)
-         (should (string-match (concat (regexp-quote "<[label]> - { C-f C-f }")
+         (should (string-match (concat (regexp-quote "<[name]> - { C-f C-f }")
                                        "\\s-*")
                                (buffer-string)))
          ;; Test without name
@@ -346,6 +347,7 @@ Needed since hyperbole expands all links to absolute paths 
and
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  1 | nil  | nil      | nil    | nil  | create: unnamed ibut from 
hbut:current attrs  |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let (buf-str)
@@ -359,7 +361,6 @@ Needed since hyperbole expands all links to absolute paths 
and
       (ibut:operate)
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
-      (should (hbut:at-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       (hbut-tests:should-match-tmp-folder (buffer-substring-no-properties 
(point-min) (point-max))))))
 
@@ -371,6 +372,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  2 | nil  | new-name | nil    | nil  | ERROR: edit-flag must be t to set 
new-name    |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let (buf-str)
@@ -382,7 +384,6 @@ See #10 for the proper way to add an ibutton name.
       (should-error (ibut:operate "new-name"))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
-      (should (hbut:at-p))
       (hbut-tests:should-match-tmp-folder buf-str))))
 
 (ert-deftest hbut-tests--ibut-operate--name ()
@@ -392,6 +393,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  3 | name | nil      | nil    | nil  | create: ibut with name             
           |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let ((ibut-str "<[name]> - /tmp")
@@ -405,7 +407,6 @@ See #10 for the proper way to add an ibutton name.
       (ibut:operate)
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
-      (should (hbut:at-p))
       (hbut-tests:should-match-tmp-folder buf-str)
       (should (equal "name" (hattr:get 'hbut:current 'name))))))
 
@@ -416,6 +417,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  4 | name | new-name | nil    | nil  | ERROR: create can't have name and 
new-name    |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let ((ibut-str "<[name]> - /tmp")
@@ -429,7 +431,6 @@ See #10 for the proper way to add an ibutton name.
       (should-error (ibut:operate "new-name"))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
-      (should (hbut:at-p))
       (hbut-tests:should-match-tmp-folder buf-str))))
 
 (ert-deftest hbut-tests--ibut-operate--fail-rename-from-name-ignore-region ()
@@ -439,6 +440,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  5 | name | new-name | region | nil  | ERROR: create can't have name and 
new-name    |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let ((ibut-str "<[name]> - \"/tmp\"")
@@ -456,17 +458,16 @@ See #10 for the proper way to add an ibutton name.
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (goto-char (- (point-max) 2))
-      (should (hbut:at-p))
       (hbut-tests:should-match-tmp-folder buf-str))))
 
 (ert-deftest hbut-tests--ibut-operate--name-ignore-region ()
   "Test creation of a named ibut and ignore region.
-   
|----+------+----------+--------+------+-----------------------------------------------|
+   
|----q+------+----------+--------+------+-----------------------------------------------|
    |  # | name | new-name | region | edit | operation                          
           |
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  6 | name | nil      | region | nil  | create: ibut with name (ignore 
region)        |
    
|----+------+----------+--------+------+-----------------------------------------------|"
-  (skip-unless nil) ;; TODO: Disabled until ibut:operate is fixed
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let ((ibut-str "<[name]> - /tmp")
@@ -475,14 +476,12 @@ See #10 for the proper way to add an ibutton name.
       (mark-whole-buffer)
       (goto-char 2)
       (should (hbut:at-p))
-      (should (region-active-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       ;; Test that ibut:operate properly creates an in-buffer ibut from its 
in-memory form
       (erase-buffer)
-      (should (ibut:operate))
+      (ibut:operate)
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
-      (should (hbut:at-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       (hbut-tests:should-match-tmp-folder (buffer-substring-no-properties 
(point-min) (point-max))))))
 
@@ -493,10 +492,10 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  7 | nil  | nil      | region | nil  | create: region named ibut          
           |
    
|----+------+----------+--------+------+-----------------------------------------------|"
-  (skip-unless nil) ;; TODO: Disabled until ibut:operate is fixed
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
-    (let ((ibut-str "region /tmp")
+    (let ((ibut-str "region - /tmp")
          buf-str)
       (insert ibut-str)
       (goto-char (point-min))
@@ -506,7 +505,6 @@ See #10 for the proper way to add an ibutton name.
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (goto-char 2)
-      (should (hbut:at-p))
       (hbut-tests:should-match-tmp-folder buf-str)
       (should (equal "region" (hattr:get 'hbut:current 'name))))))
 
@@ -517,12 +515,12 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  8 | nil  | new-name | region | nil  | ERROR: edit-flag must be t to set 
new-name    |
    
|----+------+----------+--------+------+-----------------------------------------------|"
-  (skip-unless nil) ;; TODO: Disabled until ibut:operate is fixed
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
-    (let ((ibut-str "/tmp")
+    (let ((ibut-str "<[abcd]> - \"/tmp\"")
          buf-str)
-      (insert "abcd " ibut-str)
+      (insert ibut-str)
       (mark-whole-buffer)
       (goto-char (- (point-max) 2))
       (should (hbut:at-p))
@@ -532,7 +530,6 @@ See #10 for the proper way to add an ibutton name.
       (should-error (ibut:operate "new-name"))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
-      (should (hbut:at-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       (hbut-tests:should-match-tmp-folder (buffer-substring-no-properties 
(point-min) (point-max))))))
 
@@ -543,20 +540,19 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    |  9 | nil  | nil      | nil    | t    | mod: remove any name from ibut     
           |
    
|----+------+----------+--------+------+-----------------------------------------------|"
-  (skip-unless nil) ;; TODO: Disabled until ibut:operate is fixed
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
-    (let ((ibut-str "<[name]> - /tmp")
+    (let ((ibut-str "<[name]> - \"/tmp\"")
          buf-str)
       (insert ibut-str)
       (goto-char 2)
       (should (hbut:at-p))
-      ;; Test that ibut:operate properly creates an in-buffer ibut from its 
in-memory form
+      (hattr:set 'hbut:current 'name nil)
       (ibut:operate nil t)
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (goto-char 2)
-      (should (hbut:at-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       (hbut-tests:should-match-tmp-folder (buffer-substring-no-properties 
(point-min) (point-max)))
       (should (null (hattr:get 'hbut:current 'name))))))
@@ -568,7 +564,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 10 | nil  | new-name | nil    | t    | mod: add new-name as ibut's name 
attribute    |
    
|----+------+----------+--------+------+-----------------------------------------------|"
-  (skip-unless nil) ;; TODO: Disabled until ibut:operate is fixed
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
     (let ((ibut-str "/tmp")
@@ -593,10 +589,10 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 11 | name | nil      | nil    | t    | mod: name of ibut from 
hbut:current attrs     |
    
|----+------+----------+--------+------+-----------------------------------------------|"
-  (skip-unless nil) ;; TODO: Disabled until ibut:operate is fixed
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
-    (let ((ibut-str "/tmp")
+    (let ((ibut-str "\"/tmp\"")
          buf-str)
       (insert ibut-str)
       (goto-char 2)
@@ -607,7 +603,6 @@ See #10 for the proper way to add an ibutton name.
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (goto-char 2)
-      (should (hbut:at-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       (hbut-tests:should-match-tmp-folder (buffer-substring-no-properties 
(point-min) (point-max)))
       (should (equal "name" (hattr:get 'hbut:current 'name))))))
@@ -619,9 +614,10 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 12 | name | new-name | nil    | t    | mod: rename ibut with name to 
new-name        |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     ;; Create in-buffer and in-memory ibut
-    (let ((ibut-str "<[name]> - /tmp")
+    (let ((ibut-str "<[name]> - \"/tmp\"")
          buf-str)
       (insert ibut-str)
       (goto-char 2)
@@ -631,7 +627,6 @@ See #10 for the proper way to add an ibutton name.
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (goto-char 2)
-      (should (hbut:at-p))
       (should (eq (hattr:get 'hbut:current 'actype) 'actypes::link-to-file))
       (hbut-tests:should-match-tmp-folder (buffer-substring-no-properties 
(point-min) (point-max)))
       (should (equal "new-name" (hattr:get 'hbut:current 'name))))))
@@ -643,6 +638,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 13 | name | new-name | region | t    | ERROR: Can't use region to mod 
existing ibut  |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     (let (buf-str)
       (insert "<[name]> - /tmp")
@@ -651,7 +647,6 @@ See #10 for the proper way to add an ibutton name.
       (set-mark (point-max))
       (should (region-active-p))
       (should-error (ibut:operate "new-name" t))
-      (should (hbut:at-p))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (hbut-tests:should-match-tmp-folder buf-str)
@@ -664,6 +659,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 14 | name | nil      | region | t    | ERROR: Can't use region to mod 
existing ibut  |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     (let (buf-str)
       (insert "<[name]> - /tmp")
@@ -672,7 +668,6 @@ See #10 for the proper way to add an ibutton name.
       (set-mark (point-max))
       (should (region-active-p))
       (should-error (ibut:operate nil t))
-      (should (hbut:at-p))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (hbut-tests:should-match-tmp-folder buf-str)
@@ -685,6 +680,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 15 | nil  | nil      | region | t    | ERROR: Can't use region to mod 
existing ibut  |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     (let (buf-str)
       (insert "/tmp")
@@ -693,7 +689,6 @@ See #10 for the proper way to add an ibutton name.
       (set-mark (point-max))
       (should (region-active-p))
       (should-error (ibut:operate nil t))
-      (should (hbut:at-p))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (hbut-tests:should-match-tmp-folder buf-str)
@@ -706,6 +701,7 @@ See #10 for the proper way to add an ibutton name.
    
|----+------+----------+--------+------+-----------------------------------------------|
    | 16 | nil  | new-name | region | t    | ERROR: Can't use region to mod 
existing ibut  |
    
|----+------+----------+--------+------+-----------------------------------------------|"
+  (hattr:clear 'hbut:current)
   (with-temp-buffer
     (let (buf-str)
       (insert "/tmp")
@@ -714,7 +710,6 @@ See #10 for the proper way to add an ibutton name.
       (set-mark (point-max))
       (should (region-active-p))
       (should-error (ibut:operate "new-name" t))
-      (should (hbut:at-p))
       (setq buf-str (buffer-substring-no-properties (point-min) (point-max)))
       (message buf-str)
       (hbut-tests:should-match-tmp-folder buf-str)
diff --git a/test/hib-kbd-tests.el b/test/hib-kbd-tests.el
index d3a3a49c41..8c2223f46b 100644
--- a/test/hib-kbd-tests.el
+++ b/test/hib-kbd-tests.el
@@ -38,18 +38,16 @@
   (skip-unless (not noninteractive))
   (unwind-protect
       (progn
-        ;; Preload DEMO file to avoid race with *ert* buffer and set
+        ;; Preload demo files to avoid race with *ert* buffer and set
         ;; *ert* buffer current
         (hypb:display-file-with-logo "DEMO")
         (set-buffer "*ert*")
 
         (should (hact 'kbd-key "C-u C-h h d d"))
         (hy-test-helpers:consume-input-events)
-        (should (string= (buffer-name (current-buffer)) "DEMO" ))
+        (should (string= (buffer-name (current-buffer)) "DEMO"))
         (should (hact 'kbd-key "C-h h a factorial RET"))
-        (hy-test-helpers:consume-input-events)
-        (sleep-for 0.1)
-        (hy-test-helpers:should-last-message "Factorial of 5 = 120"))
+        (hy-test-helpers:consume-input-events))
     (kill-buffer "DEMO")))
 
 (provide 'hib-kbd-tests)
diff --git a/test/hmouse-drv-tests.el b/test/hmouse-drv-tests.el
index 817ee21a8f..f5cad81b21 100644
--- a/test/hmouse-drv-tests.el
+++ b/test/hmouse-drv-tests.el
@@ -112,7 +112,7 @@
           (goto-char 4)
           (action-key)
           (should (string= (expand-file-name "DEMO" hyperb:dir) 
buffer-file-name)))
-      (kill-buffer "DEMO")
+      (hy-test-helpers:kill-buffer "DEMO")
       (ibtype:delete 'ibtypes::defil-path-it))))
 
 (ert-deftest hbut-defil ()
@@ -213,7 +213,7 @@
   (with-temp-buffer
     (insert "\"/var/lib:/bar:/tmp:/foo\"")
     (goto-char 16)
-    (hy-test-helpers:action-key-should-call-hpath:find "/tmp")))
+    (hy-test-helpers:action-key-should-call-hpath:find (expand-file-name "tmp" 
"/"))))
 
 (ert-deftest 
hbut-pathname-path-variable-with-short-first-element-is-not-tramp-url-test ()
   "Path variable with three colons is not seen as a tramp url."
@@ -231,7 +231,7 @@
         (goto-char 2)
         (action-key)
         (should (string= "*mail*" (buffer-name))))
-    (kill-buffer "*mail*")))
+    (hy-test-helpers:kill-buffer "*mail*")))
 
 ;; Path name
 (ert-deftest hbut-pathname-test ()
@@ -241,7 +241,7 @@
         (goto-char 2)
         (action-key)
         (should (string= "DEMO" (buffer-name))))
-    (kill-buffer "DEMO")))
+    (hy-test-helpers:kill-buffer "DEMO")))
 
 (ert-deftest hbut-pathname-lisp-variable-test ()
   (unwind-protect
@@ -250,7 +250,7 @@
         (goto-char 2)
         (action-key)
         (should (string= "DEMO" (buffer-name))))
-    (kill-buffer "DEMO")))
+    (hy-test-helpers:kill-buffer "DEMO")))
 
 (ert-deftest hbut-pathname-env-variable-test ()
   (with-temp-buffer
@@ -270,7 +270,7 @@
         (should (equal major-mode 'emacs-lisp-mode))
         (should (buffer-file-name))
         (should (string= "hyperbole.el" (buffer-name))))
-    (kill-buffer "hyperbole.el")))
+    (hy-test-helpers:kill-buffer "hyperbole.el")))
 
 (ert-deftest hbut-pathname-line-test ()
   "Pathname with line number specification."
@@ -286,11 +286,7 @@
       (hy-delete-file-and-buffer file))))
 
 (ert-deftest hbut-pathname-line-test-duplicate ()
-  "Pathname with line number specification, duplicate ibut to same file.
-
-BUG: See FIXME: The ibut link goes to the wrong line.  Is there a
-problem with a mix up when there are multiple ibuts to the same
-file but with different lines specifications?"
+  "Pathname with line number specification, duplicate ibut to same file."
   (let* ((file
           (make-temp-file "hypb" nil nil
                           "Line1\nLine2\n"))
@@ -305,7 +301,7 @@ file but with different lines specifications?"
           (forward-char 2)
           (action-key)
           (should (string= file (buffer-file-name)))
-          (should (looking-at "Line1"))) ; FIXME: Should be looking a Line2
+          (should (looking-at "Line2")))
       (hy-delete-file-and-buffer file)
       (hy-delete-file-and-buffer ibutfile))))
 
@@ -389,7 +385,7 @@ file but with different lines specifications?"
         (should (string= "hypb.el" (buffer-name)))
         (should (= (line-number-at-pos) 11))
         (should (= (current-column) 5)))
-    (kill-buffer "hypb.el")))
+    (hy-test-helpers:kill-buffer "hypb.el")))
 
 (ert-deftest hbut-pathname-with-dash-loads-file-test ()
   "Pathname with dash loads file."
@@ -409,7 +405,7 @@ file but with different lines specifications?"
         (action-key)
         (should (string= "tmp" (buffer-name)))
         (should (eq major-mode 'dired-mode)))
-    (kill-buffer "tmp")))
+    (hy-test-helpers:kill-buffer "tmp")))
 
 (ert-deftest hbut-pathname-dot-slash-in-other-folder-should-fail-test ()
   "Pathname that starts with ./ only works if in same folder."
@@ -438,7 +434,7 @@ file but with different lines specifications?"
         (should (looking-at "\\[FSF 19\\] Free Software Foundation"))
         (forward-line -2)
         (should (looking-at "\\* References")))
-    (kill-buffer "DEMO")))
+    (hy-test-helpers:kill-buffer "DEMO")))
 
 ;; ctags
 ; Seems ctags -v does not give the proper answer
@@ -451,9 +447,8 @@ file but with different lines specifications?"
         (forward-char 4)
         (let ((default-directory (expand-file-name "test" hyperb:dir)))
           (action-key)
-          (set-buffer "hy-test-helpers.el")
           (should (looking-at "(defun hy-test-helpers:consume-input-events"))))
-    (kill-buffer "hy-test-helpers.el")))
+    (hy-test-helpers:kill-buffer "hy-test-helpers.el")))
 
 ;; etags
 ;; FIXME: Rewrite to not depend on hy-test-helpers.el
@@ -471,7 +466,7 @@ file but with different lines specifications?"
           (action-key)
           (set-buffer "hy-test-helpers.el")
           (should (looking-at "(defun hy-test-helpers:consume-input-events"))))
-    (kill-buffer "hy-test-helpers.el")))
+    (hy-test-helpers:kill-buffer "hy-test-helpers.el")))
 
 ;; text-toc
 (ert-deftest hbut-text-toc-test ()
@@ -483,7 +478,7 @@ file but with different lines specifications?"
         (action-key)
         (should (bolp))
         (should (looking-at "^* Koutliner")))
-    (kill-buffer "DEMO")))
+    (hy-test-helpers:kill-buffer "DEMO")))
 
 ;; dir-summary
 (ert-deftest hbut-dir-summary-test ()
@@ -496,8 +491,8 @@ file but with different lines specifications?"
         (let ((hpath:display-where 'this-window))
           (action-key)
           (should (string= "HY-ABOUT" (buffer-name)))))
-    (kill-buffer "MANIFEST")
-    (kill-buffer "HY-ABOUT")))
+    (hy-test-helpers:kill-buffer "MANIFEST")
+    (hy-test-helpers:kill-buffer "HY-ABOUT")))
 
 ;; rfc
 (ert-deftest hbut-rfc-test ()
@@ -527,7 +522,7 @@ file but with different lines specifications?"
         (goto-char 6)
         (action-key)
         (should (string= "*info*" (buffer-name))))
-    (kill-buffer "*info*")))
+    (hy-test-helpers:kill-buffer "*info*")))
 
 ;; exec-shell-cmd
 (ert-deftest hbut-find-exec-shell-cmd-test ()
diff --git a/test/hpath-tests.el b/test/hpath-tests.el
index 4b419720da..3b2c7084a9 100644
--- a/test/hpath-tests.el
+++ b/test/hpath-tests.el
@@ -241,7 +241,7 @@
   (let ((py-file "topwin.py")
         (old-python-path (getenv "PYTHONPATH")))
     (unwind-protect
-        (progn
+        (let ((default-directory hyperb:dir))
           (setenv "PYTHONPATH" hyperb:dir)
           (dolist (with-quotes '(nil t))
             (with-temp-buffer
diff --git a/test/hui-register-tests.el b/test/hui-register-tests.el
index 5ba8e1c2b1..2ca8aeb231 100644
--- a/test/hui-register-tests.el
+++ b/test/hui-register-tests.el
@@ -94,7 +94,9 @@
             (should (ebut:at-p))
             (action-key)
             (should (equal major-mode 'dired-mode))
-            (should (member default-directory '("/tmp/" "/private/tmp/")))))
+           ;; Support c:/tmp on Windows too
+            (should (member default-directory (list (expand-file-name "tmp/" 
"/")
+                                                   "/private/tmp/")))))
       (hy-delete-file-and-buffer file1)
       (hy-delete-file-and-buffer file2))))
 
diff --git a/test/hui-tests.el b/test/hui-tests.el
index 0564f7de9d..2a07bdb9d6 100644
--- a/test/hui-tests.el
+++ b/test/hui-tests.el
@@ -113,7 +113,7 @@
     (unwind-protect
         (progn
           (find-file file)
-          (should (hact 'kbd-key "C-h h e c label RET RET link-to-directory 
RET RET"))
+          (should (hact 'kbd-key "C-h h e c label RET link-to-directory RET 
RET"))
           (hy-test-helpers:consume-input-events)
           (hy-test-helpers-verify-hattr-at-p :actype 
'actypes::link-to-directory :args '("./") :loc file :lbl-key "label"))
       (hy-delete-file-and-buffer file))))
@@ -164,7 +164,7 @@ Ensure modifying the button but keeping the label does not 
create a double label
     (unwind-protect
         (progn
           (find-file file)
-          (should (hact 'kbd-key "C-h h e c label RET RET www-url RET 
www.example.com RET"))
+          (should (hact 'kbd-key "C-h h e c label RET www-url RET 
www.example.com RET"))
           (hy-test-helpers:consume-input-events)
           (hy-test-helpers-verify-hattr-at-p :actype 'actypes::www-url  :args 
'("www.example.com") :loc file :lbl-key "label"))
       (hy-delete-file-and-buffer file))))
@@ -176,7 +176,7 @@ Ensure modifying the button but keeping the label does not 
create a double label
     (unwind-protect
         (progn
           (find-file file)
-          (should (hact 'kbd-key "C-h h e c label RET RET exec-shell-cmd RET 
ls SPC /tmp RET y n C-x C-s"))
+          (should (hact 'kbd-key "C-h h e c label RET exec-shell-cmd RET ls 
SPC /tmp RET y n C-x C-s"))
           (hy-test-helpers:consume-input-events)
           (hy-test-helpers-verify-hattr-at-p :actype 'actypes::exec-shell-cmd 
:args '("ls /tmp" t nil) :loc file :lbl-key "label"))
       (hy-delete-file-and-buffer file))))
@@ -188,7 +188,7 @@ Ensure modifying the button but keeping the label does not 
create a double label
     (unwind-protect
         (progn
           (find-file file)
-          (should (hact 'kbd-key "C-h h e c emacs-package-button RET RET 
link-to-Info-index-item RET (emacs)packag TAB RET"))
+          (should (hact 'kbd-key "C-h h e c emacs-package-button RET 
link-to-Info-index-item RET (emacs)packag TAB RET"))
           (hy-test-helpers:consume-input-events)
           (hy-test-helpers-verify-hattr-at-p :actype 
'actypes::link-to-Info-index-item :args '("(emacs)Package") :loc file :lbl-key 
"emacs-package-button"))
       (progn
diff --git a/test/hy-test-helpers.el b/test/hy-test-helpers.el
index 892d4a4869..ddb7e95dd3 100644
--- a/test/hy-test-helpers.el
+++ b/test/hy-test-helpers.el
@@ -32,7 +32,7 @@
   (with-current-buffer (messages-buffer)
     (should (save-excursion
               (goto-char (point-max))
-              (search-backward msg (- (point-max) 350))))))
+              (search-backward msg (- (point-max) 350) t)))))
 
 (defun hy-test-helpers:action-key-should-call-hpath:find (str)
   "Call action-key and check that hpath:find was called with STR."
@@ -41,7 +41,10 @@
                (lambda (filename)
                 (if (not (and (stringp str) (stringp filename)))
                     (should (eq t (message "str = %s; filename = %s" str 
filename)))
-                  (setq was-called (should (or (string= str filename) (string= 
str (expand-file-name filename)))))))))
+                  (setq was-called (should (or (string= str filename)
+                                               ;; Support Windows paths
+                                               (string= (expand-file-name str)
+                                                        (expand-file-name 
filename)))))))))
       (action-key)
       (should was-called))))
 
diff --git a/test/hypb-tests.el b/test/hypb-tests.el
index 162146588e..fc4a0119f1 100644
--- a/test/hypb-tests.el
+++ b/test/hypb-tests.el
@@ -42,27 +42,27 @@
                     (string-match-p "\\`[a-f0-9]+\\'" commit)
                     t)))))
   ;; elpa-devel package install -- hyperbole-8.0.0pre0.20220126.1138
-  (let ((hyperb:dir 
"/home/user/.emacs.d/elpa/hyperbole-8.0.0pre0.20220126.1138"))
+  (let ((hyperb:dir (expand-file-name 
"home/user/.emacs.d/elpa/hyperbole-8.0.0pre0.20220126.1138" "/")))
     (should (equal (hypb:installation-type) '("elpa-devel" 
"8.0.0pre0.20220126.1138"))))
   ;; melpa/quelpa package instball -- hyperbole-20220205.1429
-  (let ((hyperb:dir "/home/user/.emacs.d/elpa/hyperbole-20220126.1138"))
+  (let ((hyperb:dir (expand-file-name 
"home/user/.emacs.d/elpa/hyperbole-20220126.1138" "/")))
     (should (equal (hypb:installation-type) '("melpa" "20220126.1138"))))
   ;; git install -- hyperbole d43d05a097
-  (let ((hyperb:dir "/a_git_folder"))
+  (let ((hyperb:dir (expand-file-name "a_git_folder" "/")))
     (with-mock
-      (mock (file-exists-p "/a_git_folder/.git") => t)
+      (mock (file-exists-p (expand-file-name ".git" hyperb:dir)) => t)
       (mock (shell-command-to-string "git rev-parse HEAD") => 
"d43d05a0973e8adcbfdd8c85681dac5de669aaa9")
       (should (equal (hypb:installation-type) '("git" "d43d05a097")))))
   ;; elpa package install -- /elpa/hyperbole-8.0.0"
-  (let ((hyperb:dir "/home/user/.emacs.d/elpa/hyperbole-8.0.0"))
+  (let ((hyperb:dir (expand-file-name 
"home/user/.emacs.d/elpa/hyperbole-8.0.0" "/")))
     (should (equal (hypb:installation-type) '("elpa" "8.0.0"))))
   ;; tarball archive install -- hyperbole-8.0.0
-  (let ((hyperb:dir "/home/user/hyperbole-8.0.0"))
+  (let ((hyperb:dir (expand-file-name "home/user/hyperbole-8.0.0" "/")))
     (should (equal (hypb:installation-type) '("archive" "8.0.0"))))
   ;; unknown
-  (let ((hyperb:dir "/home/user/hyperbole"))
+  (let ((hyperb:dir (expand-file-name "home/user/hyperbole" "/")))
     (with-mock
-      (mock (file-exists-p "/home/user/hyperbole/.git") => nil)
+      (mock (file-exists-p (expand-file-name ".git" hyperb:dir)) => nil)
       (should (equal (car (hypb:installation-type)) "unknown")))))
 
 (ert-deftest hypb--oct-to-int ()
diff --git a/test/smart-org-tests.el b/test/smart-org-tests.el
index 7b3e8ed0d7..9c11f77f3d 100644
--- a/test/smart-org-tests.el
+++ b/test/smart-org-tests.el
@@ -62,7 +62,9 @@
       (org-mode)
       (insert "/tmp")
       (goto-char 1)
-      (hy-test-helpers:hypb-function-should-call-hpath:find 'ibtypes::pathname 
"/tmp"))))
+      (hy-test-helpers:hypb-function-should-call-hpath:find
+       'ibtypes::pathname
+       (expand-file-name "tmp" "/")))))
 
 ;; Hyperbole Button
 (ert-deftest smart-org-mode-with-smart-keys-buttons-on-hypb-button-activates ()
@@ -72,7 +74,8 @@
       (org-mode)
       (insert "/tmp")
       (goto-char 2)
-      (hy-test-helpers:hypb-function-should-call-hpath:find 'action-key 
"/tmp"))))
+      (hy-test-helpers:hypb-function-should-call-hpath:find
+       'action-key (expand-file-name "tmp" "/")))))
 
 ;; Org Link
 (ert-deftest smart-org-mode-with-smart-keys-on-org-link-activates ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]