diff --git a/library/lafite/LAFITE-INDENT b/library/lafite/LAFITE-INDENT
index 2ffb95fc..999a7838 100644
--- a/library/lafite/LAFITE-INDENT
+++ b/library/lafite/LAFITE-INDENT
@@ -1,16 +1,18 @@
-(DEFINE-FILE-INFO §READTABLE "INTERLISP" §PACKAGE "INTERLISP")
-(FILECREATED "22-Jan-87 01:34:36" {ERIS}<LISPUSERS>LISPCORE>LAFITE-INDENT.;1 25845  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      previous date%: "21-Jan-87 16:06:01" {ERIS}<LISPUSERS>KOTO>LAFITE-INDENT.;5)
+(FILECREATED "15-Feb-2025 09:21:58" {WMEDLEY}<library>lafite>LAFITE-INDENT.;3 26659  
 
+      :EDIT-BY rmk
+
+      :CHANGES-TO (FNS TEDIT-MAKE-LINES-EXPLICIT TEDIT-INDENT-SET-INDENT 
+                       TEDIT-INDENT-BREAK-LONG-LINES TEDIT-INDENT-SELECTION TEDIT-OPEN-LINE)
+
+      :PREVIOUS-DATE "15-Feb-2025 09:18:22" {WMEDLEY}<library>lafite>LAFITE-INDENT.;2)
 
-(* "
-Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT LAFITE-INDENTCOMS)
 
-(RPAQQ LAFITE-INDENTCOMS 
+(RPAQQ LAFITE-INDENTCOMS
        [(* * LAFITE-INDENT defines a function that will indent the current selection.)
         (FNS TEDIT-INDENT-ADD-INDENTATION TEDIT-INDENT-BREAK-LINE TEDIT-INDENT-BREAK-LONG-LINES 
              TEDIT-INDENT-FIND-BREAKPOINT TEDIT-INDENT-REPLACE-SELECTION TEDIT-INDENT-SELECTION 
@@ -31,12 +33,14 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
                                                           (SUBITEMS (Indent 'TEDIT-INDENT-SELECTION 
                                                                        "Indent the current selection"
                                                                            )
-                                                                 ("Indent & keep lines" '
-                                                            TEDIT-INDENT-SELECTION-KEEPING-LINEBREAKS 
+                                                                 ("Indent & keep lines" 
+                                                                        '
+                                                            TEDIT-INDENT-SELECTION-KEEPING-LINEBREAKS
+                                                                        
                                          "Indent the current selection, keeping existing line breaks"
                                                                         )
-                                                                 ("Set indent" '
-                                                                        TEDIT-INDENT-SET-INDENT 
+                                                                 ("Set indent" 
+                                                                        'TEDIT-INDENT-SET-INDENT 
                                                                "Set the indent string to a new value"
                                                                         )
                                                                  (Unindent 'TEDIT-REMOVE-INDENT 
@@ -45,12 +49,14 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
                                                                  ("Open line" 'TEDIT-OPEN-LINE 
                                                           "Open a blank line at the current position"
                                                                         )
-                                                                 ("Insert <RETURN>s" '
-                                                                        TEDIT-MAKE-LINES-EXPLICIT 
+                                                                 ("Insert <RETURN>s" 
+                                                                        'TEDIT-MAKE-LINES-EXPLICIT 
                              "Insert real <RETURN>s at the end of each line in the current selection"
                                                                         )
-                                                                 ("Break long lines" '
-                                                                        TEDIT-INDENT-BREAK-LONG-LINES 
+                                                                 ("Break long lines" 
+                                                                        '
+                                                                        TEDIT-INDENT-BREAK-LONG-LINES
+                                                                        
                                                   "Break long lines by inserting explicit <RETURN>'s"
                                                                         ])
 (* * LAFITE-INDENT defines a function that will indent the current selection.)
@@ -127,14 +133,10 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
                                          max-length max-length])
 
 (TEDIT-INDENT-BREAK-LONG-LINES
-  [LAMBDA (text-stream explicit-paragraph-breaks?)           (* smL "21-Jan-87 16:03")
-          
-          (* * Break the current selection into explicit lines, each having no more than 
-          *TEDIT-INDENT-LINE-LENGTH* characters. -
-          If the flag *TEDIT-INDENT-KEEP-LINE-BREAKS* is false, existing line breaks in 
-          the current selection are removed. -
-          This is intended to be used in Lafite, where one wants to indent a piece of a 
-          forwarded document, but can be used in any TEdit document)
+  [LAMBDA (text-stream explicit-paragraph-breaks?)           (* ; "Edited 15-Feb-2025 09:15 by rmk")
+                                                             (* smL "21-Jan-87 16:03")
+
+(* ;;; "Break the current selection into explicit lines, each having no more than *TEDIT-INDENT-LINE-LENGTH* characters.  --- If the flag *TEDIT-INDENT-KEEP-LINE-BREAKS* is false, existing line breaks in the current selection are removed.  --- This is intended to be used in Lafite, where one wants to indent a piece of a forwarded document, but can be used in any TEdit document")
 
     (LET ((selection (TEDIT.GETSEL text-stream)))
          (TEDIT-INDENT-REPLACE-SELECTION
@@ -142,11 +144,12 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
           (CONCATLIST (for string on (TEDIT-INDENT-SEPERATE-PARAGRAPHS (TEDIT.SEL.AS.STRING 
                                                                               text-stream selection)
                                             explicit-paragraph-breaks?)
-                         bind [hanging-indent _
-                                     (AND (NOT (EQP (fetch CHAR1 of (CAR (fetch L1 of selection)))
-                                                    (fetch CH# of selection)))
-                                          (DIFFERENCE (fetch CH# of selection)
-                                                 (fetch CHAR1 of (CAR (fetch L1 of selection]
+                         bind [hanging-indent _ (AND (NOT (EQP (GETLD (CAR (GETSEL selection L1))
+                                                                      LCHAR1)
+                                                               (GETSEL selection CH#)))
+                                                     (DIFFERENCE (GETSEL selection CH#)
+                                                            (GETLD (CAR (GETSEL selection L1))
+                                                                   LCHAR1]
                          join (PROG1 (LIST (TEDIT-INDENT-ADD-INDENTATION (CAR string)
                                                   "" *TEDIT-INDENT-LINE-LENGTH* hanging-indent)
                                            *eol-string*)
@@ -181,15 +184,10 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
                 'RIGHT])
 
 (TEDIT-INDENT-SELECTION
-  [LAMBDA (text-stream explicit-paragraph-breaks?)           (* smL "21-Jan-87 16:00")
-          
-          (* * Indent the current selection by prefacing each line with the value of 
-          *TEDIT-INDENT-STRING*, and inserting line breaks after each 
-          *TEDIT-INDENT-LINE-LENGTH* characters. -
-          If the flag *TEDIT-INDENT-KEEP-LINE-BREAKS* is false, existing line breaks in 
-          the current selection are removed. -
-          This is intended to be used in Lafite, where one wants to indent a piece of a 
-          forwarded document, but can be used in any TEdit document)
+  [LAMBDA (text-stream explicit-paragraph-breaks?)           (* ; "Edited 15-Feb-2025 09:17 by rmk")
+                                                             (* smL "21-Jan-87 16:00")
+
+(* ;;; "Indent the current selection by prefacing each line with the value of *TEDIT-INDENT-STRING*, and inserting line breaks after each *TEDIT-INDENT-LINE-LENGTH* characters.  --- If the flag *TEDIT-INDENT-KEEP-LINE-BREAKS* is false, existing line breaks in the current selection are removed.  --- This is intended to be used in Lafite, where one wants to indent a piece of a forwarded document, but can be used in any TEdit document")
 
     (LET ((selection (TEDIT.GETSEL text-stream)))
          (TEDIT-INDENT-REPLACE-SELECTION
@@ -197,11 +195,12 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
           (CONCATLIST (for string on (TEDIT-INDENT-SEPERATE-PARAGRAPHS (TEDIT.SEL.AS.STRING 
                                                                               text-stream selection)
                                             explicit-paragraph-breaks?)
-                         bind [hanging-indent _
-                                     (AND (NOT (EQP (fetch CHAR1 of (CAR (fetch L1 of selection)))
-                                                    (fetch CH# of selection)))
-                                          (DIFFERENCE (fetch CH# of selection)
-                                                 (fetch CHAR1 of (CAR (fetch L1 of selection]
+                         bind [hanging-indent _ (AND (NOT (EQP (GETLD (CAR (GETSEL selection L1))
+                                                                      LCHAR1)
+                                                               (GETSEL selection CH#)))
+                                                     (DIFFERENCE (GETSEL selection CH#)
+                                                            (GETLD (CAR (GETSEL selection L1))
+                                                                   LCHAR1]
                          join (PROG1 (LIST (TEDIT-INDENT-ADD-INDENTATION (CAR string)
                                                   *TEDIT-INDENT-STRING* *TEDIT-INDENT-LINE-LENGTH* 
                                                   hanging-indent)
@@ -231,18 +230,19 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
       else (\TEDIT-INDENT-SEPERATE-PARAGRAPHS string NIL])
 
 (TEDIT-INDENT-SET-INDENT
-  [LAMBDA (text-stream)                                      (* smL "12-Sep-86 17:09")
-          
-          (* * Prompt the user for a new indentation string)
+  [LAMBDA (text-stream)                                      (* ; "Edited 15-Feb-2025 09:21 by rmk")
+                                                             (* smL "12-Sep-86 17:09")
 
-    (LET* ((window (fetch \WINDOW of (TEXTOBJ text-stream)))
+(* ;;; "Prompt the user for a new indentation string")
+
+    (LET* ((window (\TEDIT.PRIMARYPANE text-stream))
            (pwindow (if window
                         then (GETPROMPTWINDOW (if (LISTP window)
                                                   then (CAR window)
                                                 else window))
                       else PROMPTWINDOW)))
           (CLEARW pwindow)
-          (SETQ *TEDIT-INDENT-STRING* (PROMPTFORWORD "New indent string: " *TEDIT-INDENT-STRING* NIL 
+          (SETQ *TEDIT-INDENT-STRING* (PROMPTFORWORD "New indent string: " *TEDIT-INDENT-STRING* NIL
                                              pwindow NIL NIL (LIST (CHARCODE EOL])
 
 (TEDIT-INDENT-STRIP-INDENTATION
@@ -267,36 +267,33 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
                          else string])
 
 (TEDIT-MAKE-LINES-EXPLICIT
-  [LAMBDA (text-stream)                                      (* smL " 8-Sep-86 18:20")
-          
-          (* * Take the current selection and replace all TEdit end-of-lines with 
-          explicit line breaks. -
-          This is intended to be used in Lafite, where it is sometimes nice to know that 
-          anyone receiving the msg will see the same line breaks that you see.
-          see, but can be used in any TEdit document)
+  [LAMBDA (text-stream)                                      (* ; "Edited 15-Feb-2025 09:20 by rmk")
+                                                             (* smL " 8-Sep-86 18:20")
+
+(* ;;; "Take the current selection and replace all TEdit end-of-lines with explicit line breaks.  --- This is intended to be used in Lafite, where it is sometimes nice to know that anyone receiving the msg will see the same line breaks that you see.  see, but can be used in any TEdit document")
 
     (LET ((selection (TEDIT.GETSEL text-stream)))
-         [for i in (bind (this-line _ (CAR (fetch L1 of selection)))
-                         [last-line _ (CAR (LAST (fetch LN of selection]
-                      repeatuntil (PROGN (SETQ this-line (fetch NEXTLINE of this-line))
-                                         (EQ this-line last-line)) collect (fetch CHARLIM
-                                                                              of this-line))
-            do (TEDIT.SETSEL text-stream i 1 'LEFT T)
-               (TEDIT.INSERT text-stream (CONSTANT (CHARACTER (CHARCODE EOL]
+         [for i in (bind (this-line _ (CAR (GETSEL selection L1)))
+                         [last-line _ (CAR (LAST (GETSEL selection LN]
+                      repeatuntil (PROGN (SETQ this-line (GETLD this-line NEXTLINE))
+                                         (EQ this-line last-line)) collect (GETLD this-line LCHARLIM)
+                         ) do (TEDIT.SETSEL text-stream i 1 'LEFT T)
+                              (TEDIT.INSERT text-stream (CONSTANT (CHARACTER (CHARCODE EOL]
          (TEDIT.SETSEL text-stream selection NIL 'RIGHT])
 
 (TEDIT-OPEN-LINE
-  [LAMBDA (text-stream)                                      (* smL "17-Sep-86 11:13")
-          
-          (* * Open a new line at the current position.)
+  [LAMBDA (text-stream)                                      (* ; "Edited 15-Feb-2025 09:16 by rmk")
+                                                             (* smL "17-Sep-86 11:13")
+
+(* ;;; "Open a new line at the current position.")
 
     (LET ((selection (TEDIT.GETSEL text-stream)))
-         (TEDIT.INSERT text-stream (CONCAT *eol-string*
-                                          (ALLOCSTRING [DIFFERENCE (fetch CH# of selection)
-                                                              (fetch CHAR1
-                                                                 of (CAR (fetch L1 of selection]
-                                                 " ")))
-         (if (ZEROP (fetch DCH of selection))
+         (TEDIT.INSERT text-stream (CONCAT *eol-string* (ALLOCSTRING
+                                                         (DIFFERENCE (GETSEL selection CH#)
+                                                                (GETLD (CAR (GETSEL selection L1))
+                                                                       LCHAR1))
+                                                         " ")))
+         (if (ZEROP (GETSEL selection DCH))
              then (TEDIT.SETSEL text-stream selection])
 
 (TEDIT-REMOVE-INDENT
@@ -393,21 +390,27 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
 
 (RPAQ *eol-string* (CHARACTER (CHARCODE EOL)))
 
+
 [CONSTANTS (*eol-string* (CHARACTER (CHARCODE EOL]
 )
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS *TEDIT-INDENT-STRING* *TEDIT-INDENT-LINE-LENGTH*)
 )
+
 (OR (GETD 'TEDIT)
     (FILESLOAD TEDIT))
+
 (TEDIT.REMOVE.MENUITEM TEDIT.DEFAULT.MENU 'Indent)
+
 [TEDIT.ADD.MENUITEM TEDIT.DEFAULT.MENU '(Indent 'TEDIT-INDENT-SELECTION 
                                                "Indent the current selection"
                                                (SUBITEMS (Indent 'TEDIT-INDENT-SELECTION 
                                                                 "Indent the current selection")
-                                                      ("Indent & keep lines" '
-                                                            TEDIT-INDENT-SELECTION-KEEPING-LINEBREAKS 
+                                                      ("Indent & keep lines" 
+                                                             '
+                                                            TEDIT-INDENT-SELECTION-KEEPING-LINEBREAKS
+                                                             
                                          "Indent the current selection, keeping existing line breaks"
                                                              )
                                                       ("Set indent" 'TEDIT-INDENT-SET-INDENT 
@@ -418,21 +421,21 @@ Copyright (c) 1986, 1987 by Xerox Corporation.  All rights reserved.
                                                       ("Open line" 'TEDIT-OPEN-LINE 
                                                           "Open a blank line at the current position"
                                                              )
-                                                      ("Insert <RETURN>s" 'TEDIT-MAKE-LINES-EXPLICIT 
+                                                      ("Insert <RETURN>s" 'TEDIT-MAKE-LINES-EXPLICIT
+                                                             
                              "Insert real <RETURN>s at the end of each line in the current selection"
                                                              )
-                                                      ("Break long lines" '
-                                                             TEDIT-INDENT-BREAK-LONG-LINES 
+                                                      ("Break long lines" 
+                                                             'TEDIT-INDENT-BREAK-LONG-LINES 
                                                   "Break long lines by inserting explicit <RETURN>'s"
                                                              ]
-(PUTPROPS LAFITE-INDENT COPYRIGHT ("Xerox Corporation" 1986 1987))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3949 23354 (TEDIT-INDENT-ADD-INDENTATION 3959 . 6527) (TEDIT-INDENT-BREAK-LINE 6529 . 
-8462) (TEDIT-INDENT-BREAK-LONG-LINES 8464 . 10231) (TEDIT-INDENT-FIND-BREAKPOINT 10233 . 11056) (
-TEDIT-INDENT-REPLACE-SELECTION 11058 . 11615) (TEDIT-INDENT-SELECTION 11617 . 13518) (
-TEDIT-INDENT-SELECTION-KEEPING-LINEBREAKS 13520 . 13799) (TEDIT-INDENT-SEPERATE-PARAGRAPHS 13801 . 
-14530) (TEDIT-INDENT-SET-INDENT 14532 . 15306) (TEDIT-INDENT-STRIP-INDENTATION 15308 . 16528) (
-TEDIT-MAKE-LINES-EXPLICIT 16530 . 17735) (TEDIT-OPEN-LINE 17737 . 18493) (TEDIT-REMOVE-INDENT 18495 . 
-19265) (\TEDIT-INDENT-COUNT-SPACES 19267 . 19868) (\TEDIT-INDENT-FIND-PARAGRAPH-END 19870 . 20841) (
-\TEDIT-INDENT-SEPERATE-LINES 20843 . 21641) (\TEDIT-INDENT-SEPERATE-PARAGRAPHS 21643 . 23352)))))
+  (FILEMAP (NIL (4363 24047 (TEDIT-INDENT-ADD-INDENTATION 4373 . 6941) (TEDIT-INDENT-BREAK-LINE 6943 . 
+8876) (TEDIT-INDENT-BREAK-LONG-LINES 8878 . 10742) (TEDIT-INDENT-FIND-BREAKPOINT 10744 . 11567) (
+TEDIT-INDENT-REPLACE-SELECTION 11569 . 12126) (TEDIT-INDENT-SELECTION 12128 . 14111) (
+TEDIT-INDENT-SELECTION-KEEPING-LINEBREAKS 14113 . 14392) (TEDIT-INDENT-SEPERATE-PARAGRAPHS 14394 . 
+15123) (TEDIT-INDENT-SET-INDENT 15125 . 15971) (TEDIT-INDENT-STRIP-INDENTATION 15973 . 17193) (
+TEDIT-MAKE-LINES-EXPLICIT 17195 . 18345) (TEDIT-OPEN-LINE 18347 . 19186) (TEDIT-REMOVE-INDENT 19188 . 
+19958) (\TEDIT-INDENT-COUNT-SPACES 19960 . 20561) (\TEDIT-INDENT-FIND-PARAGRAPH-END 20563 . 21534) (
+\TEDIT-INDENT-SEPERATE-LINES 21536 . 22334) (\TEDIT-INDENT-SEPERATE-PARAGRAPHS 22336 . 24045)))))
 STOP
diff --git a/library/lafite/LAFITE-INDENT.LCOM b/library/lafite/LAFITE-INDENT.LCOM
index f158f64e..59075ba3 100644
Binary files a/library/lafite/LAFITE-INDENT.LCOM and b/library/lafite/LAFITE-INDENT.LCOM differ
