[Pkg-jed-commit] r363 - in jed/trunk/debian: . patches
Jörg Sommer
jo-guest at costa.debian.org
Mon Aug 14 13:30:21 UTC 2006
Author: jo-guest
Date: 2006-08-14 13:30:20 +0000 (Mon, 14 Aug 2006)
New Revision: 363
Added:
jed/trunk/debian/patches/doc.dpatch
jed/trunk/debian/patches/fix-pymode-block-end.dpatch
Modified:
jed/trunk/debian/patches/00list
jed/trunk/debian/rules
Log:
* patches/fix-pymode-block-end.dpatch
+ Added a patch to fix the poor detection of block ends in pymode.
* patches/doc.dpatch
+ Added a patch for some mistakes in the documentation.
* debian/rules
+ Fixed a typo: CFLAFS vs. CFLAGS.
+ Some time ago, I proposed on the mailinglist to set additional
compiler flags to raise warnings about common sources of errors. Now,
I've did it, because nobody rejected it.
Modified: jed/trunk/debian/patches/00list
===================================================================
--- jed/trunk/debian/patches/00list 2006-08-13 13:57:20 UTC (rev 362)
+++ jed/trunk/debian/patches/00list 2006-08-14 13:30:20 UTC (rev 363)
@@ -12,3 +12,6 @@
/* libgpm is not supported by these architectures: #345268 #95843 */
60_gpm-mouse-support
#endif
+
+fix-pymode-block-end
+doc
Added: jed/trunk/debian/patches/doc.dpatch
===================================================================
--- jed/trunk/debian/patches/doc.dpatch 2006-08-13 13:57:20 UTC (rev 362)
+++ jed/trunk/debian/patches/doc.dpatch 2006-08-14 13:30:20 UTC (rev 363)
@@ -0,0 +1,98 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## doc.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: Fixes some mistakes in the documentation and extends it a little bit.
+##
+## Please, change the according rtl files, too!
+
+ at DPATCH@
+--- jed~/doc/txt/hooks.txt (Revision 35)
++++ jed/doc/txt/hooks.txt (Arbeitskopie)
+@@ -88,7 +88,7 @@
+ "wrapok_hook"
+ This hook may be used to enable automatic wrapping on a
+ line-by-line basis. Jed will call this hook prior to wrapping a
+- line, and if it returns a non-zero value, the line wll be
++ line, and if it returns a non-zero value, the line will be
+ wrapped. See lib/slmode.sl for an example of its use.
+
+ "newline_indent_hook"
+--- jed~/doc/tm/rtl/misc.tm (Revision 35)
++++ jed/doc/tm/rtl/misc.tm (Arbeitskopie)
+@@ -1,13 +1,12 @@
+ \variable{BATCH}
+ \synopsis{Non-Zero if in Batch Mode}
+-\usage{Int_Type BATCH}
++\usage{Int_Type BATCH (read-only)}
+ \description
+- \var{BATCH} is a read-only variable will be zero if the editor is run
++ \var{BATCH} will be zero if the editor is run
+ in interactive or full-screen mode. It will be \1 if the editor is
+ in batch mode (via the \exmp{-batch} comment line argument). If the
+ editor is in script mode (via \exmp{-script}), then the value of
+ \var{BATCH} will be \2.
+-\seealso{}
+ \done
+
+ \variable{JED_ROOT}
+@@ -31,7 +30,7 @@
+
+ \variable{_jed_secure_mode}
+ \synopsis{Indicates if the editor is in secure mode}
+-\usage{Int_Type _jed_secure_mode}
++\usage{Int_Type _jed_secure_mode (read-only)}
+ \description
+ The value of \var{_jed_secure_mode} will be non-zero if the editor
+ is running in secure mode. This mode does not allow any access to
+@@ -176,7 +175,7 @@
+ \done
+
+ \function{is_internal}
+-\synopsis{Tst if function "f" is defined as an internal function}
++\synopsis{Test if function "f" is defined as an internal function}
+ \usage{Integer is_internal(String f)}
+ \description
+ \var{is_internal} returns non-zero is function \var{f} is defined as an
+--- jed~/doc/hlp/jedfuns.hlp (Revision 35)
++++ jed/doc/hlp/jedfuns.hlp (Arbeitskopie)
+@@ -3869,17 +3869,14 @@
+ Non-Zero if in Batch Mode
+
+ USAGE
+- Int_Type BATCH
++ Int_Type BATCH (read-only)
+
+ DESCRIPTION
+- `BATCH' is a read-only variable will be zero if the editor is run
+- in interactive or full-screen mode. It will be 1 if the editor is
+- in batch mode (via the `-batch' comment line argument). If the
+- editor is in script mode (via `-script'), then the value of
+- `BATCH' will be 2.
++ `BATCH' will be zero if the editor is run in interactive or
++ full-screen mode. It will be 1 if the editor is in batch mode
++ (via the `-batch' command line argument). If the editor is in
++ script mode (via `-script'), then the value of `BATCH' will be 2.
+
+- SEE ALSO
+-
+ --------------------------------------------------------------
+
+ JED_ROOT
+@@ -3923,7 +3920,7 @@
+ Indicates if the editor is in secure mode
+
+ USAGE
+- Int_Type _jed_secure_mode
++ Int_Type _jed_secure_mode (read-only)
+
+ DESCRIPTION
+ The value of `_jed_secure_mode' will be non-zero if the editor
+@@ -4148,7 +4145,7 @@
+ is_internal
+
+ SYNOPSIS
+- Tst if function "f" is defined as an internal function
++ Test if function "f" is defined as an internal function
+
+ USAGE
+ Integer is_internal(String f)
Added: jed/trunk/debian/patches/fix-pymode-block-end.dpatch
===================================================================
--- jed/trunk/debian/patches/fix-pymode-block-end.dpatch 2006-08-13 13:57:20 UTC (rev 362)
+++ jed/trunk/debian/patches/fix-pymode-block-end.dpatch 2006-08-14 13:30:20 UTC (rev 363)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-pymode-block-end.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+## taken from a patch Peter Bengtsson <peter at fry-it.com> send on
+## 8 Aug 2006 15:49:46 +0100 to the jed mailing list
+##
+## DP: PyMode treats lines starting with "passport" or "returning" (they start
+## DP: with a keyword) as the last line of a block, which is wrong.
+
+ 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 18:13:15.761345577 +0200
+@@ -87,13 +87,10 @@
+ private define py_endblock_cmd()
+ {
+ bol_skip_white();
+- if (looking_at("return") or
+- looking_at("raise") or
+- looking_at("break") or
+- looking_at("pass") or
+- looking_at("continue"))
+- return 1;
+- return 0;
++ push_mark();
++ skip_chars("a-z");
++ return is_list_element("return,raise,break,pass,continue",
++ bufsubstr(), ',') > 0;
+ }
+
+ private define py_line_starts_subblock()
Modified: jed/trunk/debian/rules
===================================================================
--- jed/trunk/debian/rules 2006-08-13 13:57:20 UTC (rev 362)
+++ jed/trunk/debian/rules 2006-08-14 13:30:20 UTC (rev 363)
@@ -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
More information about the Pkg-jed-commit
mailing list