Changes from Kevin:

* New options file for STB
* Changed some ADRs to ADRLs so that they reach for the options combination
  for STB

Version 4.92. Tagged as 'Wimp-4_92'

VersionASM

 ;
 ; This file is automatically maintained by srccommit, do not edit manually.
-; Last processed by srccommit version: 1.68.
+; Last processed by srccommit version: 1.2.
 ;
                         GBLS    Module_MajorVersion
                         GBLA    Module_Version
@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "4.91"
-Module_Version          SETA    491
+Module_MajorVersion     SETS    "4.92"
+Module_Version          SETA    492
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "22 Apr 2003"
-Module_ApplicationDate  SETS    "22-Apr-03"
+Module_Date             SETS    "05 Jul 2004"
+Module_ApplicationDate  SETS    "05-Jul-04"
 Module_ComponentName    SETS    "Wimp"
 Module_ComponentPath    SETS    "RiscOS/Sources/Desktop/Wimp"
-Module_FullVersion      SETS    "4.91"
-Module_HelpVersion      SETS    "4.91 (22 Apr 2003)"
+Module_FullVersion      SETS    "4.92"
+Module_HelpVersion      SETS    "4.92 (05 Jul 2004)"
                         END

VersionNum

-/* (4.91)
+/* (4.92)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.68.
+ * Last processed by srccommit version: 1.2.
  *
  */
-#define Module_MajorVersion_CMHG        4.91
+#define Module_MajorVersion_CMHG        4.92
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                22 Apr 2003
+#define Module_Date_CMHG                05 Jul 2004
 
-#define Module_MajorVersion             "4.91"
-#define Module_Version                  491
+#define Module_MajorVersion             "4.92"
+#define Module_Version                  492
 #define Module_MinorVersion             ""
-#define Module_Date                     "22 Apr 2003"
+#define Module_Date                     "05 Jul 2004"
 
-#define Module_ApplicationDate          "22-Apr-03"
+#define Module_ApplicationDate          "05-Jul-04"
 
 #define Module_ComponentName            "Wimp"
 #define Module_ComponentPath            "RiscOS/Sources/Desktop/Wimp"
 
-#define Module_FullVersion              "4.91"
-#define Module_HelpVersion              "4.91 (22 Apr 2003)"
-#define Module_LibraryVersionInfo       "4:91"
+#define Module_FullVersion              "4.92"
+#define Module_HelpVersion              "4.92 (05 Jul 2004)"
+#define Module_LibraryVersionInfo       "4:92"

s/NewSWIs

@@ -366,7 +366,7 @@ textop_truncate
         BNE     %BT11
         CMP     r3,#0
         Pull    "pc", EQ
-        ADR     r1,ellipsis
+        ADRL    r1,ellipsis
 12      LDRB    r14,[r1],#1
         STRB    r14,[r2],#1
         SUB     r5,r5,#1
@@ -438,7 +438,7 @@ measure_ellipsis ; called from FindFont, sets things up for textop_truncate
         MOV     r4,#0
         MOV     r5,#-1
         Push    "r1-r5"
-        ADR     r1,ellipsis
+        ADRL    r1,ellipsis
         LDR     r2,=1:SHL:18 :OR: 1:SHL:8 :OR: 1:SHL:5
         MOV     r3,#bignum/16
         MOV     r4,#bignum/16

s/Wimp05

@@ -4807,9 +4807,9 @@ setmenucaret TraceL sc
         BEQ     donemenucaret
 
         CMP     R14,#nullptr            ; unless it's a menu icon, remember it
-        ADREQ   R14,caretdata
+        ADREQL  R14,caretdata
         LDMEQIA R14,{R0-R5}
-        ADREQ   R14,oldcaretdata
+        ADREQL  R14,oldcaretdata
         STMEQIA R14,{R0-R5}
 
         pullx   "R0-R5"
@@ -4832,7 +4832,7 @@ unsetmenucaret TraceL sc
 
         MOV     R14,#nullptr
         STR     R14,menucaretwindow     ; and cancel menu caret flag
-        ADR     R14,oldcaretdata
+        ADRL    R14,oldcaretdata
         LDMIA   R14,{R0-R5}             ; R2 will be recomputed if it's an icon
         BL      int_set_caret_position