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

[Jörg Sommer]

Author: jo-guest
Date: 2006-08-14 13:39:10 +0000 (Mon, 14 Aug 2006)
New Revision: 364

Added:
   jed/branches/0.99.19/patches/doc.dpatch
   jed/branches/0.99.19/patches/fix-pymode-block-end.dpatch
   jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch
Modified:
   jed/branches/0.99.19/patches/00list
   jed/branches/0.99.19/rules
Log:
* Merged in revision 363.

* patches/pymode-python2-keywords.dpatch
  + Added the patch for new python2 keywords from Peter Bengtsson posted
    on the upstream jed mailinglist.


Modified: jed/branches/0.99.19/patches/00list
===================================================================
--- jed/branches/0.99.19/patches/00list	2006-08-14 13:30:20 UTC (rev 363)
+++ jed/branches/0.99.19/patches/00list	2006-08-14 13:39:10 UTC (rev 364)
@@ -14,3 +14,6 @@
 #endif
 
 slmode-function-popup
+fix-pymode-block-end
+doc
+pymode-python2-keywords

Copied: jed/branches/0.99.19/patches/doc.dpatch (from rev 363, jed/trunk/debian/patches/doc.dpatch)

Copied: jed/branches/0.99.19/patches/fix-pymode-block-end.dpatch (from rev 363, jed/trunk/debian/patches/fix-pymode-block-end.dpatch)

Added: jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch
===================================================================
--- jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch	2006-08-14 13:30:20 UTC (rev 363)
+++ jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch	2006-08-14 13:39:10 UTC (rev 364)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pymode-python2-keywords.dpatch by Peter Bengtsson <peter at fry-it.com>
+##
+## DP: Support (mainly syntax highlighting) for new Python 2 keywords.
+
+ at DPATCH@
+diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
+--- trunk~/lib/pymode.sl	2006-02-13 18:51:58.000000000 +0100
++++ trunk/lib/pymode.sl	2006-08-12 17:47:01.833345577 +0200
+@@ -492,26 +492,33 @@
+ () = define_keywords ($1, "ifinisor", 2); % all keywords of length 2
+ () = define_keywords ($1, "anddefdelfornottry", 3); % of length 3 ....
+ () = define_keywords ($1, "elifelseexecfrompass", 4);
+-() = define_keywords ($1, "breakclassprintraisewhile", 5);
++() = define_keywords ($1, "breakclassprintraisewhileyield", 5);
+ () = define_keywords ($1, "assertexceptglobalimportlambdareturn", 6);
+ () = define_keywords ($1, "finally", 7);
+ () = define_keywords ($1, "continue", 8);
+ 
+ % Type 1 keywords (actually these are what's in __builtins__)
+ () = define_keywords_n ($1, "id", 2, 1);
+-() = define_keywords_n ($1, "abschrcmpdirhexintlenmapmaxminoctordpowstr", 3, 1);
+-() = define_keywords_n ($1, "Noneevalhashlongopenreprtypevars", 4, 1);
+-() = define_keywords_n ($1, "applyfloatinputrangeroundtuple", 5, 1);
+-() = define_keywords_n ($1, "coercedivmodfilterlocalsreducereloadxrange", 6, 1);
+-() = define_keywords_n ($1, "IOError__doc__compiledelattrgetattrglobalshasattrsetattr", 7, 1);
+-() = define_keywords_n ($1, "EOFErrorKeyError__name__callableexecfile", 8, 1);
+-() = define_keywords_n ($1, "NameErrorTypeErrorraw_input", 9, 1);
+-() = define_keywords_n ($1, "IndexErrorSystemExitValueError__import__", 10, 1);
+-() = define_keywords_n ($1, "AccessErrorImportErrorMemoryErrorSyntaxErrorSystemError", 11, 1);
+-() = define_keywords_n ($1, "RuntimeError", 12, 1);
+-() = define_keywords_n ($1, "ConflictErrorOverflowError", 13, 1);
+-() = define_keywords_n ($1, "AttributeError", 14, 1);
+-() = define_keywords_n ($1, "KeyboardInterruptZeroDivisionError", 17, 1);
++() = define_keywords_n ($1, "setsumzipabschrcmpdirhexintlenmapmaxminoctordpowstr", 3, 1);
++() = define_keywords_n ($1, "TruebooldictexitfilehelpiterlistquitNoneevalhashlongopenreprtypevars", 4, 1);
++() = define_keywords_n ($1, "Falseslicesuperapplyfloatinputrangeroundtuple", 5, 1);
++() = define_keywords_n ($1, "bufferinternobjectsortedunichrcoercedivmodfilterlocalsreducereloadxrange", 6, 1);
++() = define_keywords_n ($1, "OSErrorWarningcomplexcreditslicenseunicodeIOError__doc__compiledelattrgetattrglobalshasattrsetattr", 7, 1);
++() = define_keywords_n ($1, "EllipsisTabErrorpropertyreversedEOFErrorKeyError__name__callableexecfile__call__", 8, 1);
++() = define_keywords_n ($1, "Exception__debug__copyrightenumeratefrozensetNameErrorTypeErrorraw_input", 9, 1);
++() = define_keywords_n ($1, "basestringisinstanceissubclassIndexErrorSystemExitValueError__import__", 10, 1);
++() = define_keywords_n ($1, "LookupErrorUserWarningclassmethodAccessErrorImportErrorMemoryErrorSyntaxErrorSystemError", 11, 1);
++() = define_keywords_n ($1, "UnicodeErrorstaticmethodRuntimeError", 12, 1);
++() = define_keywords_n ($1, "FutureWarningStandardErrorStopIterationSyntaxWarningConflictErrorOverflowError", 13, 1);
++() = define_keywords_n ($1, "AssertionErrorNotImplementedReferenceErrorRuntimeWarningAttributeErrorAssertionError", 14, 1);
++() = define_keywords_n ($1, "ArithmeticErrorOverflowWarning", 15, 1);
++() = define_keywords_n ($1, "EnvironmentErrorIndentationError", 16, 1);
++() = define_keywords_n ($1, "UnboundLocalErrorKeyboardInterruptZeroDivisionError", 17, 1);
++() = define_keywords_n ($1, "DeprecationWarningFloatingPointErrorUnicodeDecodeErrorUnicodeEncodeError", 18, 1);
++() = define_keywords_n ($1, "NotImplementedError", 19, 1);
++() = define_keywords_n ($1, "UnicodeTranslateError", 21, 1);
++() = define_keywords_n ($1, "PendingDeprecationWarning", 25, 1);
++
+ 
+ #ifdef HAS_DFA_SYNTAX
+ %%% DFA_CACHE_BEGIN %%%


Property changes on: jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: jed/branches/0.99.19/rules
===================================================================
--- jed/branches/0.99.19/rules	2006-08-14 13:30:20 UTC (rev 363)
+++ jed/branches/0.99.19/rules	2006-08-14 13:39:10 UTC (rev 364)
@@ -2,13 +2,17 @@
 
 #export DH_VERBOSE=1
 
+# These additional compiler flags should bring up warnings about common
+# sources of errors.
+CFLAGS += -Wall -Wformat=2 -Wunused -Wundef -Wextra
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
-	CFLAFS += -02
+	CFLAGS += -02
 endif
 
 include /usr/share/dpatch/dpatch.make