[Pkg-jed-commit] r791 - in jed/branches/0.99.19/debian: . patches
Jörg Sommer
jo-guest at alioth.debian.org
Mon Jul 2 11:39:54 UTC 2007
Author: jo-guest
Date: 2007-07-02 11:39:53 +0000 (Mon, 02 Jul 2007)
New Revision: 791
Added:
jed/branches/0.99.19/debian/patches/extend-help.sl.dpatch
Modified:
jed/branches/0.99.19/debian/changelog
jed/branches/0.99.19/debian/patches/00list
jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch
jed/branches/0.99.19/debian/rules
Log:
• debian/patches/fix-help.sl.dpatch
· Updated. It was broken.
• debian/patches/extend-help.sl.dpatch
· New patch.
• debian/rules
· lintian warned about throwing away the return value of make distclean.
Fixed it.
Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog 2007-07-01 11:32:29 UTC (rev 790)
+++ jed/branches/0.99.19/debian/changelog 2007-07-02 11:39:53 UTC (rev 791)
@@ -15,8 +15,14 @@
+ 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
+ * debian/patches/extend-help.sl.dpatch: A new patch to improve help.sl
+ + Improves expand_keystring() to return Alt- instead of ESC, if ALT_CHAR
+ is non-zero, and print Space instead of the space character
+ + Improves describe_bindings() to convert the key sequences with
+ expand_keystring().
+ -- Jörg Sommer <joerg at alea.gnuu.de> Mon, 2 Jul 2007 12:35:05 +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-07-01 11:32:29 UTC (rev 790)
+++ jed/branches/0.99.19/debian/patches/00list 2007-07-02 11:39:53 UTC (rev 791)
@@ -23,3 +23,4 @@
fix-update-before-key-hook
extend-jed_faq
fix-help.sl
+extend-help.sl
Added: jed/branches/0.99.19/debian/patches/extend-help.sl.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/extend-help.sl.dpatch (rev 0)
+++ jed/branches/0.99.19/debian/patches/extend-help.sl.dpatch 2007-07-02 11:39:53 UTC (rev 791)
@@ -0,0 +1,121 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## extend-help.sl.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: * Improves expand_keystring() to return Alt- instead of ESC, if ALT_CHAR
+## DP: is non-zero, and print Space instead of the space character
+## DP: * Improves describe_bindings() to convert the key sequences with
+## DP: expand_keystring().
+
+ at DPATCH@
+diff -urNad 0.99.19~/lib/help.sl 0.99.19/lib/help.sl
+--- 0.99.19~/lib/help.sl 2007-07-02 12:18:37.838960753 +0200
++++ 0.99.19/lib/help.sl 2007-07-02 12:28:03.646960753 +0200
+@@ -61,6 +61,15 @@
+ private variable Key_Name_Table = make_key_name_table ();
+ private define make_key_name_table (); % nolonger needed
+
++% a definition for a lonely Alt character cause problems, because no
++% Alt-XY where recognized
++if (ALT_CHAR != 0)
++ assoc_delete_key(Key_Name_Table, convert_keystring( char(ALT_CHAR) ));
++
++% the definition of Key_Space is missing, but it is useful
++!if ( assoc_key_exists(Key_Name_Table, " ") )
++ Key_Name_Table[" "] = "Space";
++
+ private define keyeqs (seq, key)
+ {
+ variable n = strbytelen (key);
+@@ -108,6 +117,7 @@
+ break;
+ }
+ }
++ variable append_space = 1;
+ if (dn == 0)
+ {
+ if ((seq[0] == '^') and (n > 1))
+@@ -116,7 +126,15 @@
+ switch (ch)
+ { case 'I': "TAB";}
+ { case 'M': "RET";}
+- { case '[': "ESC";}
++ { case '[':
++ if (ALT_CHAR != 0 and seq[2] != '\0')
++ {
++ append_space = 0;
++ "Alt-";
++ }
++ else
++ "ESC";
++ }
+ {
+ % default
+ "Ctrl-" + char (seq[1]);
+@@ -130,11 +148,13 @@
+ dn = strbytelen (key_name);
+ }
+ }
+- expanded_key = strcat (expanded_key, " ", key_name);
++ expanded_key = strcat (expanded_key, key_name);
++ if (append_space)
++ expanded_key = strcat (expanded_key, " ");
+ seq = substrbytes (seq, dn+1, -1);
+ }
+ if (strlen (expanded_key))
+- return substr (expanded_key, 2, -1);
++ return substr (expanded_key, 1, strlen(expanded_key) - 1);
+ return expanded_key;
+ }
+
+@@ -461,27 +481,36 @@
+ }
+
+ 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"))
++ do
+ {
+- if (what_column () > TAB)
++ push_mark();
++ !if ( ffind("\t\t\t") )
+ {
+- if ( what_column() <= TAB*3 )
+- deln( (what_column()-1)/TAB );
++ pop_mark(0);
++ continue;
++ }
++
++ key = bufsubstr();
++ variable old_len = strlen(key);
++ (key,) = strreplace(key, "ESC", "\e", strlen(key));
++ key = str_delete_chars(key, " ");
++ (key,) = strreplace(key, "SPACE", " ", strlen(key));
++ (key,) = strreplace(key, "DEL", "\x7F", strlen(key));
++ (key,) = strreplace(key, "TAB", "\t", strlen(key));
++ bol();
++ () = replace_chars(old_len, expand_keystring(key));
++
++ if (what_column () <= TAB)
++ insert_char('\t');
++ else
++ {
++ if ( what_column() <= TAB*4 )
++ deln( (what_column()-1)/TAB - 1 );
+ else
+ deln(3);
+ }
+- eol ();
+ }
++ while ( down(1) );
+
+ bob();
+
Property changes on: jed/branches/0.99.19/debian/patches/extend-help.sl.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch 2007-07-01 11:32:29 UTC (rev 790)
+++ jed/branches/0.99.19/debian/patches/fix-help.sl.dpatch 2007-07-02 11:39:53 UTC (rev 791)
@@ -11,7 +11,7 @@
@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
++++ 0.99.19/lib/help.sl 2007-07-02 12:14:26.950960753 +0200
@@ -372,13 +372,14 @@
flush("Building bindings..");
variable map = what_keymap ();
@@ -42,7 +42,7 @@
delete_line();
}
-@@ -407,32 +412,64 @@
+@@ -407,32 +412,63 @@
break;
variable global_map_key = global_map[key];
@@ -63,7 +63,7 @@
delete_line();
push_spot();
eob();
-+ (global_map_key,) = strreplace(global_map_key, "\n", "\\n"
++ (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();
@@ -74,7 +74,6 @@
+ pop_mark(0);
+ go_down_1 ();
+ }
-+
}
else
- go_down_1 ();
@@ -111,7 +110,7 @@
replace ("ESC O P", "GOLD");
while (fsearch ("\t\t\t"))
-@@ -466,6 +503,13 @@
+@@ -466,6 +502,13 @@
while (fsearch ("\t\t\t"))
{
go_right (3);
Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules 2007-07-01 11:32:29 UTC (rev 790)
+++ jed/branches/0.99.19/debian/rules 2007-07-02 11:39:53 UTC (rev 791)
@@ -23,7 +23,7 @@
clean: unpatch
dh_testdir
dh_clean
- -make distclean
+ if [ -f Makefile ]; then make distclean; fi
rm -f build-stamp install-stamp
config.status: patch-stamp
More information about the Pkg-jed-commit
mailing list