[Pkg-jed-commit] r128 - trunk/packages/jed/debian/patches

Rafael Laboissiere rafael at costa.debian.org
Fri Nov 4 10:04:55 UTC 2005


Author: rafael
Date: 2005-11-04 10:04:54 +0000 (Fri, 04 Nov 2005)
New Revision: 128

Removed:
   trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
   trunk/packages/jed/debian/patches/50_pymode_indent.dpatch
Log:
Removed patches 50_abbrev_fix.dpatch and 50_pymode_indent.dpatch,
which are already included upstream

Deleted: trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch	2005-11-03 16:47:41 UTC (rev 127)
+++ trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch	2005-11-04 10:04:54 UTC (rev 128)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_abbrev_fix.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: if an abbrevivation is added to the Global abbrev table, but it
-## DP: does not exist, jed raises an error; simply call
-## DP: define_abbreviation after startup; this patch fixes this issue
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/abbrev.c /tmp/dpep-work.pdCHmu/jed-B0.99-17.111/src/abbrev.c
---- jed-B0.99-17.111.orig/src/abbrev.c	2005-07-25 06:37:23.000000000 +0200
-+++ jed-B0.99-17.111/src/abbrev.c	2005-09-11 23:52:44.622453448 +0200
-@@ -375,7 +375,7 @@
-    
- 	if (tbl == NULL)
- 	  {
--	     (void) SLang_push_string ("Global");
-+	     (void) SLang_push_string ("");
- 	     (void) SLang_push_string ("");
- 	     return;
- 	  }

Deleted: trunk/packages/jed/debian/patches/50_pymode_indent.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_pymode_indent.dpatch	2005-11-03 16:47:41 UTC (rev 127)
+++ trunk/packages/jed/debian/patches/50_pymode_indent.dpatch	2005-11-04 10:04:54 UTC (rev 128)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_pymode_indent.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: If Py_Indent_Level is != 8 whitespace() (used to indent lines)
-## DP: mixes up tab and whitespace characters for indention. This is bad
-## DP: Python style.
-## DP: (P_I_L=4 -> level 1 = 4 whitespace, level 2 = 1 tab)
-## DP: Fixes #305668
-
- at DPATCH@
-diff -urNad jed-B0.99-17.56/lib/pymode.sl /tmp/dpep.1VBPmj/jed-B0.99-17.56/lib/pymode.sl
---- jed-B0.99-17.56.orig/lib/pymode.sl	2004-11-28 22:44:05.000000000 +0100
-+++ jed-B0.99-17.56/lib/pymode.sl	2005-04-22 22:18:21.436779048 +0200
-@@ -580,7 +580,13 @@
- {
-    variable python = "python";
-    
--   TAB = 8;
-+   % TAB is checked by whitespace(). If TAB=0 no tab character is used,
-+   % which avoids mixing up whitespace and tab indention
-+   if (Py_Indent_Level == 8)
-+     TAB = 8;
-+   else
-+     TAB = 0;
-+
-    set_mode (python, 0x4); % flag value of 4 is generic language mode
-    use_keymap(python);
-    set_buffer_hook ("indent_hook", "py_indent_line");




More information about the Pkg-jed-commit mailing list