Debian patches

["G. Milde" <g.milde@xxxxxx>]

The jed Debian package contains some patches that might be of interest for
non-Debian users too.

John, could you please have a look whether the issues are of common
interest, already handled elsewhere, or worth patching?

Thanks

Guenter


abbrev_fix.dpatch
-----------------

## by Jörg Sommer

## 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

--- ./src/abbrev.c	2005-07-25 06:37:23.000000000 +0200
+++ /tmp/dpep-work.pdCHmu/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;
 	  }



all.dpatch
----------

## by Rafael Laboissiere
## DP: Add include path for FreeType in CFLAGS

--- jed-0.99.16.pre.0.99.17.84.orig/src/Makefile.in
+++ jed-0.99.16.pre.0.99.17.84/src/Makefile.in
@@ -2,7 +2,7 @@
 
 # C compiler and C flags
 CC = @CC@
-CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -I/usr/include/freetype2
 LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@


enable-xrenderfont.dpatch
-------------------------

## by Rafael Laboissiere
## DP: Use X Render extensions in xjed


--- jed-0.99.16.pre.0.99.17.84.orig/src/jed-feat.h
+++ jed-0.99.16.pre.0.99.17.84/src/jed-feat.h
@@ -88,7 +88,7 @@
  * extension.  You also need to uncomment and possibly modify 
  * XRENDERFONTLIBS in src/Makefile
  */
-#define XJED_HAS_XRENDERFONT 0
+#define XJED_HAS_XRENDERFONT 1
 
 /* Set JED_HAS_IMPORT if you want the ability to import modules into jed via
  * the slang import statement.  This assumes that slang was compiled with 
--- jed-0.99.16.pre.0.99.17.84.orig/src/Makefile.in
+++ jed-0.99.16.pre.0.99.17.84/src/Makefile.in
@@ -59,7 +59,7 @@
  
 # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
 #    Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
-#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
+XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext


jed-manpage.dpatch
------------------

## by Rafael Laboissiere and Jörg Sommer

## DP: Explain better the behavior of option -g (#223794)
## DP: Explain option -a <joerg@xxxxxxxxxxxx>

--- jed-B0.99-17.56/doc/manual/jed.1	2005-04-15 19:42:29.026844968 +0200
+++ /tmp/dpep.I28qj8/jed-B0.99-17.56/doc/manual/jed.1	2005-04-15 19:49:03.842364856 +0200
@@ -41,11 +41,18 @@
 .I .jedrc 
 file.
 .RE
+.I -a 'file'
+.RS
+load
+.I file
+as user configuration file instead of .jedrc.
+.RE
 .I -g 'n'
 .RS
 goto line 
 .I n 
-in buffer
+in buffer (notice that in order to this option to take effect, if must
+appear after the file name in the command line, like 'jed file -g 3')
 .RE
 .I -l 'file'      
 .RS


pymode_indent.dpatch
--------------------

## by Jörg Sommer

## 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)

--- jed-B0.99-17.56/lib/pymode.sl	2004-11-28 22:44:05.000000000 +0100
+++ /tmp/dpep.1VBPmj/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");






-- 
G.Milde web.de

--------------------------
To unsubscribe send email to <jed-users-request@xxxxxxxxxxx> with
the word "unsubscribe" in the message body.
Need help? Email <jed-users-owner@xxxxxxxxxxx>.