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

[Jörg Sommer]

Author: jo-guest
Date: 2007-10-04 21:09:46 +0000 (Thu, 04 Oct 2007)
New Revision: 917

Added:
   jed/branches/0.99.19/debian/patches/fix-jed-doc-file.dpatch
Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/patches/00list
Log:
• debian/patches/fix-jed-doc-file.dpatch
  · A new patch that changes to Jed_Doc_Files go to set_doc_files(), too.


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-10-04 16:16:25 UTC (rev 916)
+++ jed/branches/0.99.19/debian/changelog	2007-10-04 21:09:46 UTC (rev 917)
@@ -11,8 +11,12 @@
     + Put the address of the SVN repository there to make it more obvious
       where the code comes from.
 
- -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 4 Oct 2007 16:21:56 +0200
+  * debian/patches/fix-jed-doc-file.dpatch
+    + New patch applied to make changes of Jed_Doc_Files made with
+      jed_(append|insert)_doc_file go to set_doc_files.
 
+ -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 4 Oct 2007 23:05:35 +0200
+
 jed (1:0.99.19~pre95-2) experimental; urgency=low
 
   * debian/patches/fix-update-before-key-hook.dpatch: The LASTKEY

Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list	2007-10-04 16:16:25 UTC (rev 916)
+++ jed/branches/0.99.19/debian/patches/00list	2007-10-04 21:09:46 UTC (rev 917)
@@ -21,3 +21,4 @@
 extend-jed_faq
 fix-help.sl
 extend-help.sl
+fix-jed-doc-file

Added: jed/branches/0.99.19/debian/patches/fix-jed-doc-file.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-jed-doc-file.dpatch	                        (rev 0)
+++ jed/branches/0.99.19/debian/patches/fix-jed-doc-file.dpatch	2007-10-04 21:09:46 UTC (rev 917)
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-jed-doc-file.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: On the highway to SLang, we should replace Jed_Doc_Files by the SLang
+## DP: internal function [gs]et_doc_files. This patch puts code into
+## DP: jed_(append|insert)_doc_file() to update set_doc_files() obversely.
+
+ at DPATCH@
+diff -urNad 0.99.19~/lib/site.sl 0.99.19/lib/site.sl
+--- 0.99.19~/lib/site.sl	2007-10-04 22:55:31.799548415 +0200
++++ 0.99.19/lib/site.sl	2007-10-04 22:55:50.995548415 +0200
+@@ -86,7 +86,6 @@
+ %!%-
+ variable Info_Directory;
+ variable Jed_Bin_Dir;
+-variable Jed_Doc_Files;
+ 
+ %!%+
+ %\variable{Jed_Highlight_Cache_Path}
+@@ -587,11 +586,21 @@
+ 
+ define jed_append_doc_file (file)
+ {
+-   Jed_Doc_Files = strcat (Jed_Doc_Files, ",", file);
++   if ( strlen(Jed_Doc_Files) )
++      Jed_Doc_Files += ",";
++   Jed_Doc_Files += file;
++
++   variable cur_files = get_doc_files();
++   set_doc_files( [cur_files[ where(cur_files != file) ], file] );
+ }
+ define jed_insert_doc_file (file)
+ {
+-   Jed_Doc_Files = strcat (file, ",", Jed_Doc_Files);
++   if ( strlen(Jed_Doc_Files) )
++      Jed_Doc_Files = "," + Jed_Doc_Files;
++   Jed_Doc_Files = strcat (file, Jed_Doc_Files);
++
++   variable cur_files = get_doc_files();
++   set_doc_files( [file, cur_files[ where(cur_files != file) ]] );
+ }
+ 
+ foreach (["jedfuns.hlp", "libfuns.hlp"])
+@@ -600,11 +609,7 @@
+ #ifdef VMS
+    $2 = "[doc.hlp]" + $2;
+ #endif
+-   $2 = dircat ($1, $2);
+-
+-   if (strlen (Jed_Doc_Files))
+-     Jed_Doc_Files += ",";
+-   Jed_Doc_Files += $2;
++   jed_append_doc_file( dircat($1, $2) );
+ }
+ 
+ #ifexists _slang_doc_dir


Property changes on: jed/branches/0.99.19/debian/patches/fix-jed-doc-file.dpatch
___________________________________________________________________
Name: svn:executable
   + *