[Pkg-jed-commit] r469 - in jed/trunk/debian: . patches
Jörg Sommer
jo-guest at alioth.debian.org
Sun Jan 7 01:27:42 CET 2007
Author: jo-guest
Date: 2007-01-07 01:27:41 +0100 (Sun, 07 Jan 2007)
New Revision: 469
Modified:
jed/trunk/debian/changelog
jed/trunk/debian/patches/fix-pymode-tab-space.dpatch
jed/trunk/debian/patches/pymode-repeat-shift.dpatch
Log:
• patches/fix-pymode-tab-space.dpatch
· Improved the patch to insert evertime spaces if spaces are needed. The new
patch work correctly for the case Günther Milde reported in #305668.
• patches/pymode-repeat-shift.dpatch
· Adapted the patch to the new fix-pymode-tab-space.dpatch patch.
• debian/changelog
· Fixed my copy&paste for the po files.
Modified: jed/trunk/debian/changelog
===================================================================
--- jed/trunk/debian/changelog 2007-01-06 16:10:29 UTC (rev 468)
+++ jed/trunk/debian/changelog 2007-01-07 00:27:41 UTC (rev 469)
@@ -6,12 +6,15 @@
* control: Moved debhelper dependency to the Pre-Depends field, because
we need debhelper in the preinst script. [JS]
- * po/nl.po: Added the translation into Portuguese of the deconf messages.
+ * po/pt.po: Added the translation into Portuguese of the deconf messages.
Thanks to Miguel Figueiredo (closes: #400510) [JS]
- * po/nl.po: Added the translation into Russian of the deconf messages.
+ * po/ru.po: Added the translation into Russian of the deconf messages.
Thanks to Yuri Kozlov (closes: #405744) [JS]
+ * patches/fix-pymode-tab-space.dpatch: Improved the patch to cover the
+ cases Günther Milde has reported. Thanks Günther (closes: #305668) [JS]
+
--
jed (0.99.18-6) unstable; urgency=low
Modified: jed/trunk/debian/patches/fix-pymode-tab-space.dpatch
===================================================================
--- jed/trunk/debian/patches/fix-pymode-tab-space.dpatch 2007-01-06 16:10:29 UTC (rev 468)
+++ jed/trunk/debian/patches/fix-pymode-tab-space.dpatch 2007-01-07 00:27:41 UTC (rev 469)
@@ -9,7 +9,22 @@
diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
--- trunk~/lib/pymode.sl (Revision 35)
+++ trunk/lib/pymode.sl (Arbeitskopie)
-@@ -139,10 +139,16 @@
+@@ -69,6 +69,14 @@
+
+
+
++private define py_whitespace(cnt)
++{
++ if ( get_blocal_var("py_use_tab") )
++ loop (cnt / TAB) insert_char('\t');
++ else
++ loop (cnt) insert_char(' ');
++}
++
+ % Set the following to your favourite indentation level
+ custom_variable("Py_Indent_Level", 4);
+
+@@ -139,10 +147,16 @@
col = what_column() - 1;
@@ -28,17 +43,16 @@
}
define py_indent_line()
-@@ -151,6 +157,9 @@
+@@ -151,7 +165,7 @@
col = py_indent_calculate();
bol_trim ();
-+ if ( get_blocal_var("py_use_tab") )
-+ loop (col / TAB) insert_char('\t');
-+ else
- whitespace( col );
+- whitespace( col );
++ py_whitespace( col );
}
-@@ -246,11 +255,19 @@
+ define py_comment_line()
+@@ -246,11 +260,19 @@
bskip_white();
if (bolp() and (col > 1)) {
pop_spot();
@@ -53,22 +67,22 @@
col--;
if (col mod Py_Indent_Level == 0)
col--;
- whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
+- whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
++ py_whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
+ }
}
else {
pop_spot();
-@@ -261,6 +278,9 @@
+@@ -261,7 +283,7 @@
define py_shift_line_right()
{
bol_skip_white();
-+ if ( get_blocal_var("py_use_tab") )
-+ insert_char('\t');
-+ else
- whitespace(Py_Indent_Level);
+- whitespace(Py_Indent_Level);
++ py_whitespace(Py_Indent_Level);
}
-@@ -293,9 +313,17 @@
+ define py_shift_region_right()
+@@ -293,9 +315,17 @@
{
bol_skip_white();
if (what_column() > Py_Indent_Level) {
@@ -86,25 +100,22 @@
}
}
-@@ -440,11 +468,17 @@
+@@ -440,12 +470,12 @@
% Indent is wrong. Hopefully it's a continuation line.
level = oldlevel; % reset level
bol_trim();
-+ if ( get_blocal_var("py_use_tab") )
-+ loop (level) insert_char('\t');
-+ else
- whitespace(level * Py_Indent_Level + (col - current_indent));
+- whitespace(level * Py_Indent_Level + (col - current_indent));
++ py_whitespace(level * Py_Indent_Level + (col - current_indent));
} else {
current_indent = col;
indent_level[level] = col;
bol_trim();
-+ if ( get_blocal_var("py_use_tab") )
-+ loop (level) insert_char('\t');
-+ else
- whitespace(level * Py_Indent_Level);
+- whitespace(level * Py_Indent_Level);
++ py_whitespace(level * Py_Indent_Level);
}
} while (down(1) == 1);
-@@ -578,12 +612,29 @@
+ }
+@@ -578,12 +608,28 @@
{
variable python = "python";
@@ -129,7 +140,6 @@
+ else
+ !if (looking_at_char('#') or eolp() or what_column() == 1)
+ {
-+ message("foo" + string(what_line()));
+ bol();
+ set_blocal_var(looking_at_char('\t'), "py_use_tab");
+ break;
Modified: jed/trunk/debian/patches/pymode-repeat-shift.dpatch
===================================================================
--- jed/trunk/debian/patches/pymode-repeat-shift.dpatch 2007-01-06 16:10:29 UTC (rev 468)
+++ jed/trunk/debian/patches/pymode-repeat-shift.dpatch 2007-01-07 00:27:41 UTC (rev 469)
@@ -9,18 +9,14 @@
diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
--- trunk~/lib/pymode.sl 2006-09-19 13:38:27.201564732 +0200
+++ trunk/lib/pymode.sl 2006-09-19 13:39:22.477564732 +0200
-@@ -274,21 +274,26 @@
+@@ -279,18 +279,21 @@
define py_shift_line_right()
{
+ variable times = prefix_argument(1);
bol_skip_white();
- if ( get_blocal_var("py_use_tab") )
-+ loop (times)
- insert_char('\t');
- else
-+ loop (times)
- whitespace(Py_Indent_Level);
+- py_whitespace(Py_Indent_Level);
++ py_whitespace(times * Py_Indent_Level);
}
define py_shift_region_right()
@@ -36,7 +32,7 @@
py_shift_line_right();
go_down_1 ();
}
-@@ -308,17 +313,18 @@
+@@ -310,17 +313,18 @@
define py_shift_line_left()
{
@@ -59,7 +55,7 @@
del_region();
}
}
-@@ -326,6 +332,7 @@
+@@ -328,6 +332,7 @@
define py_shift_region_left()
{
@@ -67,7 +63,7 @@
variable n;
check_region (1);
-@@ -333,6 +340,7 @@
+@@ -335,6 +340,7 @@
pop_mark_1 ();
loop (n - what_line ())
{
More information about the Pkg-jed-commit
mailing list