[Pkg-jed-commit] r790 - in jed/branches/0.99.19/debian: . patches

[Jörg Sommer]

Author: jo-guest
Date: 2007-07-01 11:32:29 +0000 (Sun, 01 Jul 2007)
New Revision: 790

Added:
   jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch
Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/patches/00list
Log:
• debian/patches/fix-help.sl.dpatch
  · A new patch to remove problems with help.sl


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-06-30 07:48:50 UTC (rev 789)
+++ jed/branches/0.99.19/debian/changelog	2007-07-01 11:32:29 UTC (rev 790)
@@ -6,8 +6,17 @@
 
   * /etc/jed.d/05jed-common.sl: Activated the keys Home and End by default.
 
- -- Jörg Sommer <joerg at alea.gnuu.de>  Sun, 17 Jun 2007 14:19:17 +0200
+  * debian/patches/fix-help.sl.dpatch: A new patch to fix problems in
+    help.sl:
+    + describe_bindings() doesn't take care of CASE_SEARCH with leads to the
+      problem that "ESC [ A" and "ESC [ a" is replace by the same key
+    + describe_bindings() gets confused by newlines in the key definiton,
+      like in setkey(" \n", Key_KP_Enter)
+    + describe_bindings(): A key definition that starts with @, SPACE or . must
+      must be treated specialy
 
+ -- Jörg Sommer <joerg at alea.gnuu.de>  Sun, 1 Jul 2007 13:28:58 +0200
+
 jed (1:0.99.19~pre95-1) experimental; urgency=medium
 
   * New upstream release, taken from the upstream SVN repository at

Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list	2007-06-30 07:48:50 UTC (rev 789)
+++ jed/branches/0.99.19/debian/patches/00list	2007-07-01 11:32:29 UTC (rev 790)
@@ -22,3 +22,4 @@
 update-copyright
 fix-update-before-key-hook
 extend-jed_faq
+fix-help.sl

Added: jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch	                        (rev 0)
+++ jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch	2007-07-01 11:32:29 UTC (rev 790)
@@ -0,0 +1,127 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-help.sl.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: * describe_bindings() doesn't take care of CASE_SEARCH with leads to the
+## DP:   problem that "ESC [ A" and "ESC [ a" is replace by the same key
+## DP: * describe_bindings() gets confused by newlines in the key definiton,
+## DP:   like in setkey(" \n", Key_KP_Enter)
+## DP: * describe_bindings(): A key definition that starts with @, SPACE or . must
+## DP:   must be treated specialy
+
+ at DPATCH@
+diff -urNad 0.99.19~/lib/help.sl 0.99.19/lib/help.sl
+--- 0.99.19~/lib/help.sl	2007-01-23 08:07:54.000000000 +0100
++++ 0.99.19/lib/help.sl	2007-07-01 13:24:54.469759901 +0200
+@@ -372,13 +372,14 @@
+    flush("Building bindings..");
+    variable map = what_keymap ();
+    variable buf = whatbuf ();
+-   variable cse = CASE_SEARCH;  CASE_SEARCH = 1;
+    pop2buf("*KeyBindings*");
++   variable cse = CASE_SEARCH;  CASE_SEARCH = 1;
+    erase_buffer ();
+    dump_bindings (map);
+    
+    if (map != "global")
+      {
++	variable dump_end_mark = create_user_mark();
+ 	insert("\nInherited from the global keymap:\n");
+ 	push_spot();
+ 	dump_bindings("global");
+@@ -392,8 +393,12 @@
+ 	     variable key = bufsubstr();
+ 	     go_right (3);
+ 	     push_mark();
+-	     eol();
++             !if ( fsearch("\t\t\t") )
++	       eob();
++	     go_up_1();
++	     () = dupmark();
+ 	     global_map[key] = bufsubstr();
++	     del_region();
+ 	     delete_line();
+ 	  }
+ 	
+@@ -407,32 +412,64 @@
+ 	       break;
+ 	     
+ 	     variable global_map_key = global_map[key];
++	     go_right (3);
+ 	     if (global_map_key != "")
+ 	       {
+-		  go_right (3);
+ 		  push_mark();
+-		  eol();
++		  () = fsearch("\t\t\t");
++		  if (create_user_mark() > dump_end_mark)
++		    goto_user_mark(dump_end_mark);
++		  go_up_1();
++		  () = dupmark();
+ 		  if (bufsubstr() == global_map_key)
+ 		    {
++		       del_region();
+ 		       delete_line();
+ 		       push_spot();
+ 		       eob();
++                       (global_map_key,) = strreplace(global_map_key, "\n", "\\n"
++						      strlen(global_map_key));
+ 		       vinsert ("%s\t\t\t%s\n", key, global_map_key);
+ 		       pop_spot();
+ 		    }
+ 		  else
+-		    go_down_1 ();
++		    {
++		       pop_mark(0);
++		       go_down_1 ();
++		    }
++		  
+ 	       }
+ 	     else
+-	       go_down_1 ();
++	       {
++		  () = fsearch("\t\t\t");
++		  bol();
++	       }
+ 	  }
+      }
++   else
++    {
++       bob();
++       while ( not eobp() )
++	 {
++            !if ( ffind("\t\t\t") )
++	      {
++		 go_up_1();
++		 insert("\\n");
++		 del();
++	      }
++            go_down_1();
++	 }
++    }
+    
+    bob(); 
+    replace ("ESC [ A", "UP");
++   replace ("ESC [ a", "SHIFT + UP");
+    replace ("ESC [ B", "DOWN");
++   replace ("ESC [ b", "SHIFT + DOWN");
+    replace ("ESC [ C", "RIGHT");
++   replace ("ESC [ C", "SHIFT + RIGHT");
+    replace ("ESC [ D", "LEFT");
++   replace ("ESC [ d", "SHIFT + LEFT");
+    replace ("ESC O P", "GOLD");
+ 
+    while (fsearch ("\t\t\t"))
+@@ -466,6 +503,13 @@
+    while (fsearch ("\t\t\t"))
+      {
+ 	go_right (3);
++	if ( looking_at_char('@') or looking_at_char(' ') )
++	  continue;
++        if ( looking_at_char('.') )
++	  {
++             eol();
++             bskip_chars("a-zA-Z_");
++	  }
+ 	push_mark();
+ 	!if ( ffind_char('(') )
+ 	  eol();


Property changes on: jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch
___________________________________________________________________
Name: svn:executable
   + *