[Pkg-jed-commit] r57 - in trunk/packages/jed/debian: . init.d
Guenter Milde
milde-guest@costa.debian.org
Tue, 05 Jul 2005 11:35:30 +0000
Author: milde-guest
Date: 2005-07-05 11:35:30 +0000 (Tue, 05 Jul 2005)
New Revision: 57
Removed:
trunk/packages/jed/debian/init.d/00debian.sl
Modified:
trunk/packages/jed/debian/changelog
trunk/packages/jed/debian/control
trunk/packages/jed/debian/init.d/README.Debian-startup
trunk/packages/jed/debian/init.d/jed.conf
Log:
moved the basic debian configuration to jed.conf and removed 00debian.sl
Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog 2005-07-03 23:35:22 UTC (rev 56)
+++ trunk/packages/jed/debian/changelog 2005-07-05 11:35:30 UTC (rev 57)
@@ -48,6 +48,16 @@
* if 00site.sl and 99defaults.sl exist and were changed the user is
asked if they should get removed; otherwise they are droped silently
(Closes: 266981)
+
+ +++ Changes by Guenter Milde
+
+
+ * moved the basic debian configuration stuff to jed.conf and removed
+ 00debian.sl
+ * removed the setup of paste mode now superseded by the `paste' function
+ in paste.sl
+ * removed indent_buffer() and indent_region_or_line() from the basic
+ configuration. (These functions are now in txtutils.sl in jed-extra.)
--
Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control 2005-07-03 23:35:22 UTC (rev 56)
+++ trunk/packages/jed/debian/control 2005-07-05 11:35:30 UTC (rev 57)
@@ -12,12 +12,13 @@
Description: editor for programmers (textmode version)
Jed offers:
Extensible in a language resembling C. Completely customizable.
- Capable of read GNU info files from within JED's info browser. A
- variety of programming modes (with syntax highlighting) are
- available including Pascal, Java, Perl, C, C++, FORTRAN, TeX, HTML,
- SH, IDL, DCL, NROFF, PostScript, Basic. Folding support. Edit TeX
- files with AUC-TeX style editing (BiBTeX support too). Rectangular
- cut/paste; regular expressions; incremental searches; search
+ Capable of read GNU info files from within JED's info browser.
+ A variety of programming modes (syntax highlighting and more) are
+ available including Basic, C, C++, DCL, FORTRAN, HTML, IDL, Java,
+ NROFF, Pascal, Perl, PostScript, Python, SH, TeX.
+ Folding support.
+ Edit TeX files with AUC-TeX style editing (BiBTeX support too).
+ Rectangular cut/paste; regular expressions; incremental searches; search
replace across multiple files; multiple windows; multiple buffers;
shell modes; directory editor (dired); mail; rmail; ispell; and
much more.
@@ -39,8 +40,7 @@
shell modes; directory editor (dired); mail; rmail; ispell; and
much more.
.
- Note: The S-Lang runtime files are now in the package jed-common.
- The source of these files are in jed-sl.
+ Note: The S-Lang runtime files are in the package jed-common.
.
Note: In this version, C-h deletes the previous character instead of
loading the help menu. Help is now on Esc-?.
Deleted: trunk/packages/jed/debian/init.d/00debian.sl
===================================================================
--- trunk/packages/jed/debian/init.d/00debian.sl 2005-07-03 23:35:22 UTC (rev 56)
+++ trunk/packages/jed/debian/init.d/00debian.sl 2005-07-05 11:35:30 UTC (rev 57)
@@ -1,58 +0,0 @@
-% File: 00debian.sl -*- SLang -*-
-% You can add further slang customisation here to be done by JED at startup.
-% Please read /usr/share/doc/jed-common/README.Debian-startup for more
-% information on this mechanism.
-
-% I'm using this file for adding "debian-specific" changes, as I like to keep
-% the rest of the JED installation as standard as possible <cpbotha@debian.org>
-
-% I would like to make it known that I think section 10.8 of the Debian Policy
-% w.r.t. the "Delete" key is absolute BS, but that's just my opinion.
-% Against my will, I have to make this key delete the character under the
-% cursor. <cpbotha@debian.org>
-#ifdef XWINDOWS
-x_set_keysym (0xFFFF, 0, "\e[3~");
-#endif
-setkey ("delete_char_cmd", "\e[3~");
-
-% this mode was suggested by JED on the mailing list
-autoload("paste_mode", "paste_mode");
-
-% reference for Slang is now included in jed-common
-Jed_Doc_Files = strcat (Jed_Doc_Files, ",",
- path_concat (dircat (JED_ROOT, "doc/txt"), "slangfun.txt"));
-
-% contributed by Guenter Milde
-define indent_buffer ()
-{
- push_spot;
- bob;
- do
- indent_line;
- while (down_1);
- pop_spot;
-}
-
-% contributed by Guenter Milde, fixed by cpbotha@debian.org
-define indent_region_or_line ()
-{
- !if(is_visible_mark)
- indent_line;
- else
- {
- check_region (1); % make sure the mark comes first
- variable End_Line = what_line;
- exchange_point_and_mark(); % now point is at start of region
- do
- {
- indent_line;
- }
- while (what_line <= End_Line and down_1);
- pop_spot(); % return to where we were before $
- pop_mark_0();
- }
-}
-
-% Disable loading of jed.rc from /usr/share/jed/lib, because this kills user
-% setting in their private config #219448
-Default_Jedrc_Startup_File = NULL;
Modified: trunk/packages/jed/debian/init.d/README.Debian-startup
===================================================================
--- trunk/packages/jed/debian/init.d/README.Debian-startup 2005-07-03 23:35:22 UTC (rev 56)
+++ trunk/packages/jed/debian/init.d/README.Debian-startup 2005-07-05 11:35:30 UTC (rev 57)
@@ -25,7 +25,6 @@
- which in turn calls all .sl scripts in /etc/jed-init.d/
* If -n is not specified on the command line (as first arg):
- $HOME/.jedrc (if it exists)
- - /usr/share/jed/lib/jed.rc (only if $HOME/.jedrc doesn't exist)
command_line_options
....
Modified: trunk/packages/jed/debian/init.d/jed.conf
===================================================================
--- trunk/packages/jed/debian/init.d/jed.conf 2005-07-03 23:35:22 UTC (rev 56)
+++ trunk/packages/jed/debian/init.d/jed.conf 2005-07-05 11:35:30 UTC (rev 57)
@@ -1,15 +1,33 @@
-% -*- slang -*-
+% debian jed.conf -*- slang -*-
-% debian jed.conf as suggested by John E. Davis
-% Read the documentation in /usr/share/doc/jed-common/README.Debian-startup.
-% Please do not change this if you want the documented debian startup system
-% to function correctly.
+% Disable loading of fallback config file /usr/share/jed/lib/jed.rc,
+% because this overwrites user setting in their private config #219448
+Default_Jedrc_Startup_File = NULL;
+% make delete key delete the character under the cursor
+% (section 10.8 of the Debian Policy)
+#ifdef XWINDOWS
+x_set_keysym (0xFFFF, 0, "\e[3~");
+#endif
+setkey ("delete_char_cmd", "\e[3~");
+
+% fallback emulation if the user has no ~/.jedrc config file
+_Jed_Default_Emulation = "emacs";
+% ["emacs" should become a <default-emulation> tag to be replaced with
+% the user choice by debconf at install time. Remember to change this in
+% the patched jed.rc file too.]
+
+% jed init.d
+% ----------
+%
+% Do not change the lines below, if you want the Debian startup system to
+% function correctly (see /usr/share/doc/jed-common/README.Debian-startup).
$1 = listdir ("/etc/jed-init.d");
foreach ($1[array_sort($1)])
{
$1 = ();
if (path_extname ($1) == ".sl")
- () = evalfile (path_concat ("/etc/jed-init.d", $1));
+ () = evalfile (path_concat ("/etc/jed-init.d", $1));
}
+