Changeset 2789

Timestamp:

Nov 11, 2017, 9:54:37 AM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Reverted last revision, because it contains also other preliminary changes.

File:

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

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

@@ -1102 +1102 @@
 
       -- Check if .EX file exists
-      findfile ExFile, ThisKeyset'keys.ex', 'EPMPATH'
+      findfile ExFile, ThisKeyset'Keys.ex', 'EPMPATH'
       if rc then
          leave
@@ -1108 +1108 @@
 
       -- Check if .EX file is linked
-      linkedrc = linked( ThisKeyset'keys.ex')
+      linkedrc = linked( ThisKeyset'Keys.ex')
       if linkedrc >= 0  then
          leave
@@ -1114 +1114 @@
 
       -- Link .EX file
-      'Link quiet' ThisKeyset'keys.ex'
+      'Link quiet' ThisKeyset'Keys'
       --dprintf( 'KeysetCmdExists: Keyset "'ThisKeyset'Keys" linked, rc = 'rc)
 
@@ -1393 +1393 @@
    CurAddKeyDefs  = QueryConfigKey( KeyPathSelected)
 
-   if linked( AddKeyDefs'keys.ex') > 0 then
-      'unlink' AddKeyDefs'keys.ex'
+   if linked( AddKeyDefs'keys') > 0 then
+      'unlink' AddKeyDefs'keys'
    endif
 
@@ -2003 +2003 @@
          -- Add ClosingChar only if there's a space, tab, line end
          -- or another closing char at current pos.
-         if insert_state() then
-            NextChar = substr( textline( .line), .col, length( ClosingChar))
-         else
-            NextChar = substr( textline( .line), .col + length( OpeningChar), length( ClosingChar))
-         endif
-         if NextChar = '' or NextChar = ' ' or NextChar = \9 or NextChar = ClosingChar then
+         CurChar = substr( textline( .line), .col, length( ClosingChar))
+         if CurChar = '' or CurChar = ' ' or CurChar = \9 or CurChar = ClosingChar then
             fExpanded = 1
             call Process_Keys( OpeningChar''ClosingChar)
@@ -2269 +2265 @@
    call pset_mark( 1, .last, 1, length( textline( .last)), 'CHAR' , fid)
    'Copy2SharBuff'       -- Copy mark to shared text buffer
-
-defc Reflow2ReflowMargins
-   universal reflowmargins
-   if FileIsMarked() then
-      'ReflowMark' reflowmargins
-   else
-      'ReflowAll' reflowmargins
-   endif
 
 defc ReflowAll2ReflowMargins