From 6fbe9ace4db8822d42fce9e89921768c27533a86 Mon Sep 17 00:00:00 2001 From: Robert Sprowson <rsprowson@gitlab.riscosopen.org> Date: Tue, 25 Sep 2012 07:29:46 +0000 Subject: [PATCH] Style guide ammendment While the txtedit part of RISC_OSLib has never been famed for its adherence this brings the delete operation (^K ref Style Guide p38, !ResEd, and the drag & drop protocol specification) into line. Version 5.73. Tagged as 'RISC_OSLib-5_73' --- VersionASM | 12 ++++++------ VersionNum | 20 ++++++++++---------- rlib/VerIntern/h/messages | 2 +- rlib/c/txtedit | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/VersionASM b/VersionASM index 46775e0..fb6aa3a 100644 --- a/VersionASM +++ b/VersionASM @@ -11,13 +11,13 @@ GBLS Module_HelpVersion GBLS Module_ComponentName GBLS Module_ComponentPath -Module_MajorVersion SETS "5.72" -Module_Version SETA 572 +Module_MajorVersion SETS "5.73" +Module_Version SETA 573 Module_MinorVersion SETS "" -Module_Date SETS "28 Aug 2012" -Module_ApplicationDate SETS "28-Aug-12" +Module_Date SETS "25 Sep 2012" +Module_ApplicationDate SETS "25-Sep-12" Module_ComponentName SETS "RISC_OSLib" Module_ComponentPath SETS "castle/RiscOS/Sources/Lib/RISC_OSLib" -Module_FullVersion SETS "5.72" -Module_HelpVersion SETS "5.72 (28 Aug 2012)" +Module_FullVersion SETS "5.73" +Module_HelpVersion SETS "5.73 (25 Sep 2012)" END diff --git a/VersionNum b/VersionNum index 5e15c3b..005f160 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,23 @@ -/* (5.72) +/* (5.73) * * This file is automatically maintained by srccommit, do not edit manually. * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 5.72 +#define Module_MajorVersion_CMHG 5.73 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 28 Aug 2012 +#define Module_Date_CMHG 25 Sep 2012 -#define Module_MajorVersion "5.72" -#define Module_Version 572 +#define Module_MajorVersion "5.73" +#define Module_Version 573 #define Module_MinorVersion "" -#define Module_Date "28 Aug 2012" +#define Module_Date "25 Sep 2012" -#define Module_ApplicationDate "28-Aug-12" +#define Module_ApplicationDate "25-Sep-12" #define Module_ComponentName "RISC_OSLib" #define Module_ComponentPath "castle/RiscOS/Sources/Lib/RISC_OSLib" -#define Module_FullVersion "5.72" -#define Module_HelpVersion "5.72 (28 Aug 2012)" -#define Module_LibraryVersionInfo "5:72" +#define Module_FullVersion "5.73" +#define Module_HelpVersion "5.73 (25 Sep 2012)" +#define Module_LibraryVersionInfo "5:73" diff --git a/rlib/VerIntern/h/messages b/rlib/VerIntern/h/messages index 2adeb8d..e9c8861 100644 --- a/rlib/VerIntern/h/messages +++ b/rlib/VerIntern/h/messages @@ -62,7 +62,7 @@ #define MSGS_txt13 "txt13:>Info,>File,Set type,New view,Print Print,Column tab \213F3,Overwrite \213F1,Wordwrap ^F5" #define MSGS_txt13a "txt13a:Set type " #define MSGS_txt14 "txt14:Select" -#define MSGS_txt15 "txt15:>Save,Print,Copy ^C,Move ^V,Delete ^X,Clear ^Z,>Indent ^F4" +#define MSGS_txt15 "txt15:>Save,Print,Copy ^C,Move ^V,Delete ^K,Clear ^Z,>Indent ^F4" #define MSGS_txt16 "txt16:Edit" #define MSGS_txt17 "txt17:>Find F4,>Goto F5,Undo F8,Redo F9,CR<->LF ^F8,Expand tabs,Format text ^F6" #define MSGS_txt18 "txt18:Format width" diff --git a/rlib/c/txtedit b/rlib/c/txtedit index 02d0039..505cadb 100644 --- a/rlib/c/txtedit +++ b/rlib/c/txtedit @@ -3662,7 +3662,7 @@ else case 3: /* control-C */ txtedit_copyselection(s); break; - case 24: /* control-X */ + case 11: /* control-K */ txtedit_deleteselection(); break; case 22: /* control-V */ -- GitLab