[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-6-g13a7f94

[Guenter Milde]

The following commit has been merged in the master branch:
commit 13a7f94ca4dfa0d35a942071b490adb95bb5812f
Author: Guenter Milde <milde at users.berlios.de>
Date:   Mon Nov 10 17:14:13 2008 +0100

    Let  ~/.jed/jed.rc take precedence over ~/.jedrc as Default_Jedrc_Startup_File.
    
    Update for the last commit that puts the tests in a loop and breaks if
    a user config file is found:
    
    a) changes preference to the recommended file,
    b) skips one file_status() call if ~/.jed/jed.rc exists.

diff --git a/debian/init.d/05jed-common.sl b/debian/init.d/05jed-common.sl
index 51307d8..f91e799 100644
--- a/debian/init.d/05jed-common.sl
+++ b/debian/init.d/05jed-common.sl
@@ -27,12 +27,13 @@ if ( 2 == file_status($1) ) {
    % a) command_line_hook() in site.sl tries with ~/.jed/.jedrc
    % b) recommended location: ~/.jed/jed.rc
    % c) backwards compatible: ~/.jedrc
-   $2 = path_concat($1, "jed.rc");
-   if (file_status($2) == 1)
-     Default_Jedrc_Startup_File = $2;
-   $2 = path_concat(Jed_Home_Directory, ".jedrc");
-   if (file_status($2) == 1)
-     Default_Jedrc_Startup_File = $2;
+   foreach $2 ([path_concat(Jed_Home_Directory, ".jed/jed.rc"), 
+		path_concat(Jed_Home_Directory, ".jedrc")]) {
+      if (file_status($2) == 1) {
+	 Default_Jedrc_Startup_File = $2;
+	 break;
+      }
+   }
    % now set the variable:
    Jed_Home_Directory = $1;
 }

-- 
Debian packaging of JED