[Pkg-jed-commit] r503 - in jed/trunk/debian: . init.d patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-01-16 18:40:44 +0100 (Tue, 16 Jan 2007)
New Revision: 503

Removed:
   jed/trunk/debian/patches/no-info-in-mode-hook.dpatch
Modified:
   jed/trunk/debian/changelog
   jed/trunk/debian/init.d/05jed-common.sl
   jed/trunk/debian/patches/00list
Log:
* debian/patches/no-info-in-mode-hook.dpatch: Removed file
* debian/init.d/05jed-common.sl: do not call info_mode() for *.info
  files, since info_mode is no editing mode but an info reader mode





Modified: jed/trunk/debian/changelog
===================================================================
--- jed/trunk/debian/changelog	2007-01-16 11:22:13 UTC (rev 502)
+++ jed/trunk/debian/changelog	2007-01-16 17:40:44 UTC (rev 503)
@@ -6,10 +6,9 @@
     and pymode-repeat-shift, which were temporarily dropped in the last
     release (again, closes: #305668) [RL]
 
-  * debian/patches/no-info-in-mode-hook.dpatch: In function mode_hook(),
-    to make an exception for *.info files, such that info_mode() is not
-    called.  This allows editing info files directly, instead of launching
-    the info browser (closes: #180577). [RL]
+  * debian/init.d/05jed-common.sl: Do not call info_mode() for *.info
+    files, since info_mode is no editing mode but an info reader mode
+    (closes: #180577). [GM]
 
   * debian/README.Debian: Added a Q&A entry to the FAQ section explaining
     that the Alt key should be pressed down when pasting text select

Modified: jed/trunk/debian/init.d/05jed-common.sl
===================================================================
--- jed/trunk/debian/init.d/05jed-common.sl	2007-01-16 11:22:13 UTC (rev 502)
+++ jed/trunk/debian/init.d/05jed-common.sl	2007-01-16 17:40:44 UTC (rev 503)
@@ -8,18 +8,18 @@
 setkey ("delete_char_cmd", "\e[3~");
 
 % Fallback emulation (if the user has no ~/.jedrc config file)
-% 
-% Possible values are "brief", "cua", "emacs", "edt", "ide", "jed", 
+%
+% Possible values are "brief", "cua", "emacs", "edt", "ide", "jed",
 % "wordstar", and (with jed-extra) "vi".
 %_Jed_Default_Emulation = "emacs";  % already set in site.sl
 
-% Override (obsolete) code in site.sl that calls JED_ROOT/lib/jed.rc as 
+% Override (obsolete) code in site.sl that calls JED_ROOT/lib/jed.rc as
 % fallback configuration file
 Default_Jedrc_Startup_File = NULL;
 
 % Jed_Home_Directory (defined in site.sl, defaulting to $HOME)
-% 
-% If a subdir ~/.jed/ exists, point Jed_Home_Directory there, 
+%
+% If a subdir ~/.jed/ exists, point Jed_Home_Directory there,
 % so .jedrc and .jedrecent are not spoiling the $HOME dir (FHS 2.3)
 $1 = path_concat(Jed_Home_Directory, ".jed");
 if ( 2 == file_status($1) ) {
@@ -32,22 +32,26 @@
 
 
 % Add slsh documentation (site.sl misses this)
-% 
+%
 % You might add directories containing site-wide local help files to the array
-foreach (["/usr/share/slsh/help", 
+foreach (["/usr/share/slsh/help",
           "/usr/share/slsh/local-packages/help"])
 {
    $1 = ();
    if (file_status($1) != 2)
      continue;
-   
+
    foreach (listdir($1))
      {
         $2 = ();
         if (path_extname($2) == ".hlp")
-          % the doc path set with add_doc_file() is currently not 
+          % the doc path set with add_doc_file() is currently not
           % recognized by the standard help.sl
           % add_doc_file( path_concat($1, $2) );
           Jed_Doc_Files += "," + path_concat($1, $2);
-     } 
+     }
 }
+
+% do not call info_mode() for *.info files
+% (as info_mode is no editing mode but an info reader mode!)
+add_mode_for_extension("no", "info");

Modified: jed/trunk/debian/patches/00list
===================================================================
--- jed/trunk/debian/patches/00list	2007-01-16 11:22:13 UTC (rev 502)
+++ jed/trunk/debian/patches/00list	2007-01-16 17:40:44 UTC (rev 503)
@@ -17,4 +17,4 @@
 doc
 fix-pymode-tab-space
 pymode-repeat-shift  /* depends on fix-pymode-tab-space */
-no-info-in-mode-hook
+

Deleted: jed/trunk/debian/patches/no-info-in-mode-hook.dpatch
===================================================================
--- jed/trunk/debian/patches/no-info-in-mode-hook.dpatch	2007-01-16 11:22:13 UTC (rev 502)
+++ jed/trunk/debian/patches/no-info-in-mode-hook.dpatch	2007-01-16 17:40:44 UTC (rev 503)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no-info-in-mode-hook.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-
-## DP: In function mode_hook(), to make an exception for *.info files,
-## DP: such that info_mode() is not called.  This allows editing info
-## DP: files directly, instead of launching the info browser.
-
- at DPATCH@
-
---- jed-0.99.18.orig/lib/site.sl
-+++ jed-0.99.18/lib/site.sl
-@@ -1883,8 +1883,11 @@
-    mode = strcat (strlow (ext), "_mode");
-    if (is_defined (mode) > 0)
-      {
--	eval (mode);
--	return;
-+        if (mode != "info_mode")
-+	  {
-+	     eval (mode);
-+	     return;
-+	  }
-      }
- 
-    !if (strncmp (strup (extract_filename (buffer_filename ())), "READ", 4))