From 02031bbf813178ac08785430eb9675268de007e8 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 6 Mar 2025 20:22:27 -0800 Subject: [PATCH] TEDIT-MENU: Find should work from expanded menu --- library/tedit/TEDIT-MENU | 61 +++++++++++++++++----------------- library/tedit/TEDIT-MENU.LCOM | Bin 47170 -> 47107 bytes 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/library/tedit/TEDIT-MENU b/library/tedit/TEDIT-MENU index c9796673..d91fb614 100644 --- a/library/tedit/TEDIT-MENU +++ b/library/tedit/TEDIT-MENU @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "19-Feb-2025 13:27:11" {WMEDLEY}tedit>TEDIT-MENU.;454 160645 +(FILECREATED " 5-Mar-2025 20:52:33" {WMEDLEY}TEDIT>TEDIT-MENU.;455 160734 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.PARAMENU.FILLIN \TEDIT.PARALOOKS.TO.MARBAR) - (VARS TEDIT-MENUCOMS) + :CHANGES-TO (FNS \TEDIT.EXPANDEDMENU.ACTIONFN) - :PREVIOUS-DATE " 8-Feb-2025 23:19:34" {WMEDLEY}tedit>TEDIT-MENU.;453) + :PREVIOUS-DATE "19-Feb-2025 13:27:11" {WMEDLEY}TEDIT>TEDIT-MENU.;454) (PRETTYCOMPRINT TEDIT-MENUCOMS) @@ -1326,7 +1325,8 @@ (RETURN 'DON'T]) (\TEDIT.EXPANDEDMENU.ACTIONFN - [LAMBDA (OBJ MENUSEL MENUWINDOW MENUSTREAM MAINSTREAM) (* ; "Edited 7-Jan-2025 22:36 by rmk") + [LAMBDA (OBJ MENUSEL MENUWINDOW MENUSTREAM MAINSTREAM) (* ; "Edited 5-Mar-2025 20:51 by rmk") + (* ; "Edited 7-Jan-2025 22:36 by rmk") (* ; "Edited 26-Nov-2024 23:30 by rmk") (* ; "Edited 22-Oct-2024 10:54 by rmk") (* ; "Edited 20-Oct-2024 15:40 by rmk") @@ -1373,7 +1373,8 @@ else (TEDIT.PROMPTPRINT MAINSTREAM "Include file not specified" T ))) (FIND (SETQ STATE (MB.GET 'FINDPATTERN MENUTEXTOBJ 'STATE MENUSEL)) - (if (IGEQ 1 (NCHARS STATE)) + (if (IGEQ (NCHARS STATE) + 1) then (\TEDIT.KEY.FIND MAINSTREAM NIL NIL NIL NIL STATE) else (TEDIT.PROMPTPRINT MAINSTREAM "Search pattern not specified" T) )) @@ -2619,28 +2620,28 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5083 51454 (DRAWMARGINSCALE 5093 . 8552) (MARGINBAR 8554 . 15679) (MARGINBAR.CREATE -15681 . 19100) (MB.MARGINBAR.BUTTONEVENTINFN 19102 . 26741) (MB.MARGINBAR.SELFN.TABS 26743 . 31983) ( -MB.MARGINBAR.SELFN.TABS.KIND 31985 . 32920) (MARGINBAR.GETSTATEFN 32922 . 36800) (MARGINBAR.SETSTATEFN - 36802 . 37012) (MARGINBAR.NEUTRALIZE 37014 . 37427) (MARGINBAR.LOOKS 37429 . 40535) ( -MB.MARGINBAR.SIZEFN 40537 . 41140) (MB.MARGINBAR.DISPLAYFN 41142 . 44203) (MDESCALE 44205 . 44745) ( -MSCALE 44747 . 45077) (MB.MARGINBAR.SHOWTAB 45079 . 47402) (MB.MARGINBAR.TABTRACK 47404 . 48789) ( -MARGINBAR.INIT 48791 . 50184) (\TEDIT.PARALOOKS.TO.MARBAR 50186 . 51452)) (52279 58496 ( -\TEDIT.MENU.START 52289 . 57920) (\TEDIT.MENU.BUTTONEVENTFN 57922 . 58494)) (58815 66737 ( -\TEDIT.MENU.CREATE 58825 . 60636) (\TEDIT.MENU.PARSE 60638 . 64327) (\TEDIT.MENU.NEUTRALIZE 64329 . -66400) (\TEDITMENU.RECORD.UNFORMATTED 66402 . 66735)) (66803 86736 (\TEDIT.EXPANDEDMENU.CREATE 66813 - . 72108) (\TEDIT.EXPANDEDMENU.START 72110 . 73484) (\TEDIT.EXPANDEDMENU.FN 73486 . 76741) ( -\TEDIT.EXPANDEDMENU.ACTIONFN 76743 . 86177) (TEDIT.MENUSTREAM 86179 . 86734)) (86798 102289 ( -\TEDIT.PARAMENU.CREATE 86808 . 92829) (\TEDIT.PARAMENU.START 92831 . 93697) (\TEDIT.APPLY.PARALOOKS -93699 . 94751) (\TEDIT.SHOW.PARALOOKS 94753 . 97536) (\TEDIT.PARAMENU.FILLIN 97538 . 102287)) (102408 -128184 (\TEDIT.CHARMENU.CREATE 102418 . 105022) (\TEDIT.CHARMENU.START 105024 . 106055) ( -\TEDIT.CHARMENU.SPEC 106057 . 110506) (\TEDIT.CHARMENU.PARSE 110508 . 113676) (\TEDIT.CHARMENU.FILLIN -113678 . 118023) (\TEDIT.SHOW.CHARLOOKS 118025 . 121282) (\TEDIT.APPLY.CHARLOOKS 121284 . 122445) ( -\TEDIT.OFFSETTYPE.STATEFN 122447 . 124410) (\TEDIT.OTHER.STATECHANGEFN 124412 . 126057) ( -\TEDIT.OTHER.SELECTFN 126059 . 128182)) (128246 154685 (\TEDIT.PAGEMENU.CREATE 128256 . 135450) ( -\TEDIT.SHOW.PAGELOOKS 135452 . 137247) (\TEDIT.PAGEMENU.FILLIN 137249 . 138799) ( -\TEDIT.PAGEREGION.UNPARSE 138801 . 147991) (\TEDIT.APPLY.PAGELOOKS 147993 . 149920) ( -\TEDIT.CHANGE.PAGELOOKS 149922 . 153841) (\TEDIT.PAGEMENU.CHARLOOKS.STATEFN 153843 . 154683)) (154686 -160489 (\TEDIT.PAGEMENU.CREATE.HEADINGS 154696 . 157508) (\TEDIT.PAGEMENU.HEADINGS.SETSTATEFN 157510 - . 158935) (\TEDIT.PAGEMENU.HEADINGS.STATEFN 158937 . 160487))))) + (FILEMAP (NIL (5022 51393 (DRAWMARGINSCALE 5032 . 8491) (MARGINBAR 8493 . 15618) (MARGINBAR.CREATE +15620 . 19039) (MB.MARGINBAR.BUTTONEVENTINFN 19041 . 26680) (MB.MARGINBAR.SELFN.TABS 26682 . 31922) ( +MB.MARGINBAR.SELFN.TABS.KIND 31924 . 32859) (MARGINBAR.GETSTATEFN 32861 . 36739) (MARGINBAR.SETSTATEFN + 36741 . 36951) (MARGINBAR.NEUTRALIZE 36953 . 37366) (MARGINBAR.LOOKS 37368 . 40474) ( +MB.MARGINBAR.SIZEFN 40476 . 41079) (MB.MARGINBAR.DISPLAYFN 41081 . 44142) (MDESCALE 44144 . 44684) ( +MSCALE 44686 . 45016) (MB.MARGINBAR.SHOWTAB 45018 . 47341) (MB.MARGINBAR.TABTRACK 47343 . 48728) ( +MARGINBAR.INIT 48730 . 50123) (\TEDIT.PARALOOKS.TO.MARBAR 50125 . 51391)) (52218 58435 ( +\TEDIT.MENU.START 52228 . 57859) (\TEDIT.MENU.BUTTONEVENTFN 57861 . 58433)) (58754 66676 ( +\TEDIT.MENU.CREATE 58764 . 60575) (\TEDIT.MENU.PARSE 60577 . 64266) (\TEDIT.MENU.NEUTRALIZE 64268 . +66339) (\TEDITMENU.RECORD.UNFORMATTED 66341 . 66674)) (66742 86825 (\TEDIT.EXPANDEDMENU.CREATE 66752 + . 72047) (\TEDIT.EXPANDEDMENU.START 72049 . 73423) (\TEDIT.EXPANDEDMENU.FN 73425 . 76680) ( +\TEDIT.EXPANDEDMENU.ACTIONFN 76682 . 86266) (TEDIT.MENUSTREAM 86268 . 86823)) (86887 102378 ( +\TEDIT.PARAMENU.CREATE 86897 . 92918) (\TEDIT.PARAMENU.START 92920 . 93786) (\TEDIT.APPLY.PARALOOKS +93788 . 94840) (\TEDIT.SHOW.PARALOOKS 94842 . 97625) (\TEDIT.PARAMENU.FILLIN 97627 . 102376)) (102497 +128273 (\TEDIT.CHARMENU.CREATE 102507 . 105111) (\TEDIT.CHARMENU.START 105113 . 106144) ( +\TEDIT.CHARMENU.SPEC 106146 . 110595) (\TEDIT.CHARMENU.PARSE 110597 . 113765) (\TEDIT.CHARMENU.FILLIN +113767 . 118112) (\TEDIT.SHOW.CHARLOOKS 118114 . 121371) (\TEDIT.APPLY.CHARLOOKS 121373 . 122534) ( +\TEDIT.OFFSETTYPE.STATEFN 122536 . 124499) (\TEDIT.OTHER.STATECHANGEFN 124501 . 126146) ( +\TEDIT.OTHER.SELECTFN 126148 . 128271)) (128335 154774 (\TEDIT.PAGEMENU.CREATE 128345 . 135539) ( +\TEDIT.SHOW.PAGELOOKS 135541 . 137336) (\TEDIT.PAGEMENU.FILLIN 137338 . 138888) ( +\TEDIT.PAGEREGION.UNPARSE 138890 . 148080) (\TEDIT.APPLY.PAGELOOKS 148082 . 150009) ( +\TEDIT.CHANGE.PAGELOOKS 150011 . 153930) (\TEDIT.PAGEMENU.CHARLOOKS.STATEFN 153932 . 154772)) (154775 +160578 (\TEDIT.PAGEMENU.CREATE.HEADINGS 154785 . 157597) (\TEDIT.PAGEMENU.HEADINGS.SETSTATEFN 157599 + . 159024) (\TEDIT.PAGEMENU.HEADINGS.STATEFN 159026 . 160576))))) STOP diff --git a/library/tedit/TEDIT-MENU.LCOM b/library/tedit/TEDIT-MENU.LCOM index f83bc8400682f5f406f0f2ae0dc5d0c826598f2d..9ef2611bc308b7a051b3efb92d3b9b29470dce69 100644 GIT binary patch delta 991 zcmaizO>5LZ7{}eMpk46P+QmzGNG-L+jY(!Evspz*cPG1P^R_cd<4P}Ex`)zIq$ns- zdhi2inJ?i{*rT8z_yPP57H?AUPj`grJ-e{7U4 zq#pj3@5AcN{d|7*ntFyT`dM1Uz&MXNP*R7{^z@F)Tg^D>0Yy}HlWNJ4-{$9LY(kW^ zux4Ng*Y!3_flxe25iAuf0AgFp@g$AcH-KPEeopR`Z29R!b%vOR?Dpqs*m0o4{B|ex zz1)vlaSpgnV0+v-;eP1yUgAa!Fs;k(uzDS^jbzka7?5eNY+a;&nyJBH^RJTyx+`>% zazAPVHtcChg_ZcM$poOf3ESRN#^VH#Z9~*lLX{iQsUBpILTS}dcY?8B=4l3EWBZsw~EQv8ux3WUh>c?ifMg$vak$OMa6J}R{a zh}fz`nli3FVjDP10=LQ3FPExW8WUJ#TJl1im9RWZq3js)Mz&HcMz%0ZE1+qBEF|Ns LR&s{N+1H&vj^qR5 delta 1060 zcmaJLY#pFm|R=gy0vwG_E_oQaGO(R9u%gB{}E`OzMQzd97+X$>{ipJLbsJnisdNHRk?;D zpae(EyQJa-6+-{g@E-|ef1vnfq43jujeito&8z14z~Bk|*7paJuZ0N$LdsNv$Gig_ zRwI~> zQ$V?EhL^@VwBI?OQ##T)PKi3dlOnc4WhpJAWFDx^`jjX#i$ql@AifPZ>oX-1lJ?x&C;hGH-M&4Dx4SK**?_n-r4Bf1CFNB z&CV34wbc$r4opp|sD?ec$MKG%jk*DK`{>JABTd94aN@#YrRze!&cURR%R&MRIN;#W zD)Rzp?DY4LL)vkV0!A@h4>T`jZ7aEFwU_R>U?(toZ4e}u