[Pkg-jed-commit] r239 - trunk/packages/jed/debian/init.d

[Guenter Milde]

Author: milde-guest
Date: 2005-12-13 13:08:29 +0000 (Tue, 13 Dec 2005)
New Revision: 239

Modified:
   trunk/packages/jed/debian/init.d/05jed-common.sl
Log:
bugfix: if no jedrc file existed, jed tried the upstream default that no
longer ships in the Debian package.


Modified: trunk/packages/jed/debian/init.d/05jed-common.sl
===================================================================
--- trunk/packages/jed/debian/init.d/05jed-common.sl	2005-12-13 09:46:43 UTC (rev 238)
+++ trunk/packages/jed/debian/init.d/05jed-common.sl	2005-12-13 13:08:29 UTC (rev 239)
@@ -13,14 +13,19 @@
 % "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 
+% 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) ) {
    Jed_Home_Directory = $1;
    % set the default jedrc file path to ~/.jed/jed.rc
-   Default_Jedrc_Startup_File = path_concat(Jed_Home_Directory, "jed.rc");
+   $2 = path_concat(Jed_Home_Directory, "jed.rc");
+   if (file_status($2) == 1)
+     Default_Jedrc_Startup_File = $2;
 }