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

[Guenter Milde]

Author: milde-guest
Date: 2005-09-20 14:44:16 +0000 (Tue, 20 Sep 2005)
New Revision: 64

Modified:
   trunk/packages/jed/debian/init.d/05jed-common.sl
Log:
Removed the home-lib.sl code


Modified: trunk/packages/jed/debian/init.d/05jed-common.sl
===================================================================
--- trunk/packages/jed/debian/init.d/05jed-common.sl	2005-09-20 14:36:49 UTC (rev 63)
+++ trunk/packages/jed/debian/init.d/05jed-common.sl	2005-09-20 14:44:16 UTC (rev 64)
@@ -7,108 +7,22 @@
 #endif
 setkey ("delete_char_cmd", "\e[3~");
 
-% Fallback emulation if the user has no ~/.jedrc config file.
+% Fallback emulation (if the user has no ~/.jedrc config file)
 % 
 % Possible values are "brief", "cua", "emacs", "edt", "ide", "jed", 
 % "wordstar", and (with jed-extra) "vi".
-%_Jed_Default_Emulation = "emacs";
+%_Jed_Default_Emulation = "emacs";  % already set in site.sl
 
-%  taken form home-lib.sl (http://jedmodes.sf.net)
-%  -----------------------------------------------
-%  
-%  * append \var{lib} to the library path,
-%  * evaluate (if existent) the file ini.sl in this library
-%    to enable initialization (autoloads etc).
-%  * set Color_Scheme_, dfa-cache- and documentation- path
-public define register_libdir(lib)
-{
-   !if (2 == file_status(lib)) % directory doesnot exist
-     return;
 
-   % jed library path
-   set_jed_library_path(get_jed_library_path() + "," + lib);
-
-   % colors
-   variable path = path_concat(lib, "colors");
-   if (2 == file_status(path))
-     Color_Scheme_Path = path + "," + Color_Scheme_Path;
-
-   % documentation
-   path = path_concat(lib, "libfuns.txt");
-   if (1 == file_status(path))
-     Jed_Doc_Files = path + "," + Jed_Doc_Files;
-
-   % dfa cache
-#ifdef HAS_DFA_SYNTAX
-   path = path_concat(lib, "dfa");
-   if (2 != file_status(path))
-     path = lib;
-   Jed_Highlight_Cache_Path += "," + path;
-#endif
-
-   % Check for a file ini.sl containing initialization code
-   % (e.g. autoload declarations) and evaluate it.
-   path = path_concat(lib, "ini.sl");
-   if (1 == file_status(path))
-     () = evalfile(path);
-}
-
-$1 = "/usr/local/jed/";
-if ( 2 == file_status($1) ) {
-   % jed library path
-   set_jed_library_path($1 + "," + get_jed_library_path());
-
-   % colors
-   $2 = path_concat($1, "colors");
-   if ( 2 == file_status($2) )
-     Color_Scheme_Path = $2 + "," + Color_Scheme_Path;
-
-   % documentation
-   $2 = path_concat($1, "libfuns.txt");
-   if ( 1 == file_status($2) )
-     Jed_Doc_Files = $2 + "," + Jed_Doc_Files;
-
-   % dfa cache
-#ifdef HAS_DFA_SYNTAX
-    $2 = path_concat($1, "dfa");
-    if ( 2 == file_status($2) )
-      Jed_Highlight_Cache_Path += "," + $2;
-    else
-      Jed_Highlight_Cache_Path += "," + $1;
-#endif
-}
-
-% Jed_Home_Directory is defined in site.sl, defaulting to $HOME
-% If Jed_Home_Directory/.jed/ exists, point Jed_Home_Directory there,
+% Jed_Home_Directory (defined in site.sl, defaulting to $HOME)
+% 
+% If a subdir .jed/ exists, point Jed_Home_Directory there, 
+% so .jedrc and .jedrecent are not spoiling the $HOME dir
 $1 = path_concat(Jed_Home_Directory, ".jed");
+$2 = path_concat(Jed_Home_Directory, ".jedrc");
 if ( 2 == file_status($1) ) {
+   Jed_Home_Directory = $1;
    % backwards compatibility of jedrc-location 
-   % (if nonexistent, Jed_Home_Library+"/jed.rc" will be tried)
-   $2 = path_concat(Jed_Home_Directory, ".jedrc");
    if ( 1 == file_status($2) )
      Default_Jedrc_Startup_File = $2;
-
-   Jed_Home_Directory = $1;
-
-   % jed library path
-   set_jed_library_path($1 + "," + get_jed_library_path());
-
-   % colors
-   $2 = path_concat($1, "colors");
-   if ( 2 == file_status($2) )
-     Color_Scheme_Path = $2 + "," + Color_Scheme_Path;
-
-   % documentation
-   $2 = path_concat($1, "libfuns.txt");
-   if ( 1 == file_status($2) )
-     Jed_Doc_Files = $2 + "," + Jed_Doc_Files;
-
-   % dfa cache
-#ifdef HAS_DFA_SYNTAX
-   $2 = path_concat($1, "dfa");
-   if ( 2 != file_status($2) )
-     $2 = $1;
-   Jed_Highlight_Cache_Dir = $2;
-   Jed_Highlight_Cache_Path += "," + $2;
-#endif
 }