Changeset 2432

Timestamp:

Jul 9, 2011, 8:13:02 PM (14 years ago)

Author:

Andreas Schnellbacher

Message:

• Allow for undo state at .modify = 0. This is useful after redo.

File:

• trunk/src/netlabs/macros/keys.e (modified) (7 diffs)

trunk/src/netlabs/macros/keys.e ¶

@@ -195 +195 @@
 
 ; ---------------------------------------------------------------------------
-; Define a cmd to call the proc for testing
-defc DefKey
-   parse arg KeyString Cmd
-   call DefKey( KeyString, Cmd)
-
 ; Add or redefine an entry to the active named accelerator key table.
 ;
@@ -326 +321 @@
 
    return
+
+; Define a cmd to call the proc for testing
+defc DefKey
+   parse arg KeyString Cmd
+   call DefKey( KeyString, Cmd)
 
 ; ---------------------------------------------------------------------------
@@ -589 +589 @@
 defproc MenuAccelString
    Cmd = arg(1)
-   AppString = ''
+   AccelString = ''
    -- Todo: allow for specifying consecutive Cmds: Cmd1,Cmd2 or Cmd1, Cmd2
    if Cmd <> '' then
@@ -619 +619 @@
                endif
             endif
-            if AppString <> '' then
-               AppString = AppString' | 'ThisString
+            if AccelString <> '' then
+               AccelString = AccelString' | 'ThisString
             else
-               AppString = ThisString
+               AccelString = ThisString
             endif
          enddo
       endif
    endif
-   if AppString <> '' then
-      AppString = \9''AppString
-   endif
-   return AppString
+   if AccelString <> '' then
+      AccelString = \9''AccelString
+   endif
+   return AccelString
 
 ; For testing:
 defc MenuAccelString
    Cmd = strip( arg(1))
-   sayerror 'Menu item text appendix for "'Cmd'" is: |'MenuItemApp( Cmd)'|'
+   sayerror 'Menu item text appendix for "'Cmd'" is: |'MenuAccelString( Cmd)'|'
 
 ; ---------------------------------------------------------------------------
@@ -657 +657 @@
    --dprintf( 'KeyString = 'KeyString)
 
+   -- Omit new undo record for repeated keys or repeated commands
+   if curkey = prevkey then
+      -- nop
+
+/*
    -- Omit new undo record for an unmodified file
-   if not .modify then
+   -- (This is not useful if, after a redo, a state is reached where
+   -- .modify is 0.)
+   elseif not .modify then
       -- nop
-
-   -- Omit new undo record for repeated keys
-   elseif curkey = prevkey then
-      -- nop
+*/
+
 /*
    -- Activate this if space should not create a new undo state
@@ -671 +676 @@
 */
 
+/*
    -- The following option is experimental and most likely leads to too
    -- few recorded states, e.g. when formatting or clipboard macros were
    -- used:
-/*
    -- Activate this if only return or enter should create a new undo state
    elseif not (rightstr( KeyString, 7) = 'newline' |
@@ -1492 +1497 @@
 ; ---------------------------------------------------------------------------
 defproc end_shift( startline, startcol, shift_flag, forward_flag)
-; Let's let this work regardless of which marking mode is active.
+; Make this work regardless of which marking mode is active:
 compile if 0 -- WANT_CUA_MARKING = 'SWITCH'
    universal cua_marking_switch