[Pkg-jed-commit] r508 - in jed/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-01-18 12:52:52 +0100 (Thu, 18 Jan 2007)
New Revision: 508

Added:
   jed/trunk/debian/patches/sane-color-object-return.dpatch
Modified:
   jed/trunk/debian/changelog
   jed/trunk/debian/patches/00list
Log:
* debian/patches/sane-color-object-return.dpatch: If no colors have been
  associated with a color-object, return "default" for the
  foreground/background colors instead of NULL. (This patch was taken
  from the JED SVN repository at gna.org, revision 34, corresponding to
  JED release 0.99.19-16)



Modified: jed/trunk/debian/changelog
===================================================================
--- jed/trunk/debian/changelog	2007-01-18 11:23:22 UTC (rev 507)
+++ jed/trunk/debian/changelog	2007-01-18 11:52:52 UTC (rev 508)
@@ -19,9 +19,15 @@
     describe bindings in Emacs emulation (closes: #292421) [RL]
 
   * debian/patches/highlight-isearch-results.dpatch: When using
-    incremental search, highlight the text found after each find. 
+    incremental search, highlight the text found after each find.
     This is included upstream for jed >= 0.99.19-24 (closes: #387061) [RL]
 
+  * debian/patches/sane-color-object-return.dpatch: If no colors have been
+    associated with a color-object, return "default" for the
+    foreground/background colors instead of NULL. (This patch was taken
+    from the JED SVN repository at gna.org, revision 34, corresponding to
+    JED release 0.99.19-16; closes: #378396) [RL]
+
  --
 
 jed (0.99.18-8) unstable; urgency=low

Modified: jed/trunk/debian/patches/00list
===================================================================
--- jed/trunk/debian/patches/00list	2007-01-18 11:23:22 UTC (rev 507)
+++ jed/trunk/debian/patches/00list	2007-01-18 11:52:52 UTC (rev 508)
@@ -19,3 +19,4 @@
 pymode-repeat-shift  /* depends on fix-pymode-tab-space */
 add-describe-bindings-to-C-h
 highlight-isearch-results
+sane-color-object-return

Added: jed/trunk/debian/patches/sane-color-object-return.dpatch
===================================================================
--- jed/trunk/debian/patches/sane-color-object-return.dpatch	2007-01-18 11:23:22 UTC (rev 507)
+++ jed/trunk/debian/patches/sane-color-object-return.dpatch	2007-01-18 11:52:52 UTC (rev 508)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## sane-color-object-return.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: If no colors have been associated with a color-object, return
+## DP: "default" for the foreground/background colors instead of NULL.
+## DP: (This was taken from the JED SVN repository at gna.org, revision 34,
+## DP: corresponding to JED release 0.99.19-16.)
+
+ at DPATCH@
+
+--- jed-0.99.18.orig/src/colors.c
++++ jed-0.99.18/src/colors.c
+@@ -186,8 +186,8 @@
+      i = JNORMAL_COLOR;		       
+ 
+    map = Color_Name_Map + i;
+-   (void) SLang_push_string (map->fg);
+-   (void) SLang_push_string (map->bg);
++   (void) SLang_push_string (map->fg == NULL ? "default" : map->fg);
++   (void) SLang_push_string (map->bg == NULL ? "default" : map->bg);
+ }
+ 
+ static void add_color_object_cmd (char *name)


Property changes on: jed/trunk/debian/patches/sane-color-object-return.dpatch
___________________________________________________________________
Name: svn:executable
   + *