[Pkg-jed-commit] r21 - in trunk/packages/jed-extra: . debian init patches
Rafael Laboissiere
rafael@costa.debian.org
Sat, 19 Mar 2005 09:47:42 +0100
Author: rafael
Date: 2005-03-19 09:47:42 +0100 (Sat, 19 Mar 2005)
New Revision: 21
Added:
trunk/packages/jed-extra/init/
trunk/packages/jed-extra/init/50jed-extra.sl
trunk/packages/jed-extra/init/55ispell.sl
trunk/packages/jed-extra/patches/
trunk/packages/jed-extra/patches/00list
trunk/packages/jed-extra/patches/apsconf-tmp-dir.patch
trunk/packages/jed-extra/patches/ding-require-txtutils-csvutils.patch
trunk/packages/jed-extra/patches/gnuplot-shell-cmd-on-region.patch
trunk/packages/jed-extra/patches/gnuplot-use-jedmodes-info.patch
trunk/packages/jed-extra/patches/ishell-autoload-view-mode.patch
trunk/packages/jed-extra/patches/jedscape-requires.patch
trunk/packages/jed-extra/patches/make-dfa-fixes.patch
trunk/packages/jed-extra/patches/miscfun-autoload-view-mode.patch
trunk/packages/jed-extra/patches/rc-files.patch
trunk/packages/jed-extra/patches/rfcview-require-bufutils.patch
trunk/packages/jed-extra/patches/tree-dfa-fixes.patch
trunk/packages/jed-extra/patches/view-mode-require-keydefs.patch
trunk/packages/jed-extra/patches/yodl-require.patch
Removed:
trunk/packages/jed-extra/home-lib.tgz
trunk/packages/jed-extra/ispell.tgz
trunk/packages/jed-extra/patch/
trunk/packages/jed-extra/patches/01-ispell-hash-name.patch
trunk/packages/jed-extra/patches/02-ispell-space-option.patch
trunk/packages/jed-extra/patches/03-fix-home-jedrc.patch
trunk/packages/jed-extra/patches/04-dircat-stack-order.patch
trunk/packages/jed-extra/sl_utils.tar.gz
Modified:
trunk/packages/jed-extra/compile-files.sl.in
trunk/packages/jed-extra/debian/README.Debian
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/control
trunk/packages/jed-extra/debian/rules
Log:
Debian release 1.0-1
Modified: trunk/packages/jed-extra/compile-files.sl.in
===================================================================
--- trunk/packages/jed-extra/compile-files.sl.in 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/compile-files.sl.in 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,3 +1,5 @@
+% -*- slang -*-
+
<: undef $/; :>
variable files = [
@@ -6,7 +8,8 @@
print join (",", map {"\"$_\""} split (/\s+/, $in));
:>
];
-variable i;
-for (i = 0; i < length (files); i++)
- byte_compile_file (files[i], 0);
+foreach (files) {
+ variable f = ();
+ byte_compile_file (f, 0);
+}
\ No newline at end of file
Modified: trunk/packages/jed-extra/debian/README.Debian
===================================================================
--- trunk/packages/jed-extra/debian/README.Debian 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/debian/README.Debian 2005-03-19 08:47:42 UTC (rev 21)
@@ -2,7 +2,15 @@
--------------------
This is a package which will gather several add-on package for the JED
-editor. For now, it contains only the ispell and sl_utils from
-jedmodes.sf.net, but much more will be added in the future.
+editor. For now, it contains only the jedmodes distribution from the
+jedmodes project at SourceForge (http://jedmodes.sf.net).
- -- Rafael Laboissiere <rafael@debian.org>, Fri, 11 Jul 2003 10:32:35 +0200
+The version numbering scheme for the jed-extra package is similar to the
+scheme used by the emacs-goodies.el package: the major number will be
+incremented when new files are added to the package. The minor number is
+incremented when files are removed or upstream files change. The Debian
+version number is only for Debian packaging.
+
+
+ -- Rafael Laboissiere <rafael@debian.org>
+ $Id$
Property changes on: trunk/packages/jed-extra/debian/README.Debian
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/debian/changelog 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,3 +1,15 @@
+jed-extra (1.0-1) experimental; urgency=low
+
+ +++ Changes by Rafael Laboisssiere
+
+ * Package adopted by the Debian JED Group at Alioth
+ * Complete overhaul of the package. It uses now the jedmodes.sf.net
+ distribution tarball and try to set up sensible autoloads and
+ add_completions in /etc/jed-init.d. This package is uploaded to the
+ experimental distribution.
+
+ -- Debian JED Group <pkg-jed-devel@lists.alioth.debian.org> Sat, 19 Mar 2005 09:29:18 +0100
+
jed-extra (0.1.8) unstable; urgency=low
* Changed jed-common to jed in Build-Depends (closes: #213755).
@@ -74,3 +86,7 @@
-- Rafael Laboissiere <rafael@debian.org> Fri, 11 Jul 2003 10:32:35 +0200
+Local Variables:
+debian-changelog-full-name: "Debian JED Group"
+debian-changelog-mailing-address: "pkg-jed-devel@lists.alioth.debian.org"
+End:
Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/debian/control 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,18 +1,18 @@
Source: jed-extra
Section: editors
Priority: optional
-Maintainer: Rafael Laboissiere <rafael@debian.org>
+Maintainer: Debian JED Group <pkg-jed-devel@lists.alioth.debian.org>
Build-Depends-Indep: debhelper (>> 4.0.0), eperl, jed
+Build-Conflicts-Indep: jed-extra
Standards-Version: 3.6.1
Package: jed-extra
Architecture: all
-Depends: jed-common
+Depends: jed-common (>= 0.99.16-5)
+Suggests: slsh, html2text
Conflicts: dictionaries-common (<< 0.14.0)
-Description: Collection of useful JED modes and utilities
+Description: collection of useful JED modes and utilities
This package contains add-on packages for the JED text editor from
- the JEDmodes repository at SourceForge. This is a preliminary
- release and only home-lib.sl, ispell and sl_utils are present for
- now.
+ the JEDmodes repository at SourceForge and elsewhere.
.
Homepage: http://jedmodes.sourceforge.net
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/debian/rules 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,101 +1,109 @@
#!/usr/bin/make -f
+# -*- make -*-
# debian/rules file for jed-extra
-# GNU copyright 2003 by Rafael Laboissiere <rafael@debian.org>
+# GNU copyright 2003, 2005 by Rafael Laboissiere <rafael@debian.org>
+# $Id$
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
-sl_files = \
- ispell/flyspell.sl \
- ispell/ispell_common.sl \
- ispell/ispell.sl \
- ispell/vispell.sl \
- ispell/look.sl \
- sl_utils/bufutils.sl \
- sl_utils/csvutils.sl \
- sl_utils/datutils.sl \
- sl_utils/sl_utils.sl \
- sl_utils/strutils.sl \
- sl_utils/txtutils.sl
-
-slc_files = $(sl_files:%.sl=%.slc)
-
jed_root = /usr/share/jed
debroot = $(shell pwd)/debian/jed-extra
site_lib_dir = $(jed_root)/site-lib
jed_init_dir = /etc/jed-init.d
+a2ps_ssh_dir = /usr/share/a2ps/sheets/
-untar:
+tarballs = jedmodes.tgz misc.tar.gz
+srcdirs = lib mode misc
+
+generate-patch:
+ mv $(DIR) $(DIR)-new
+ fakeroot ./debian/rules clean
+ ./debian/rules patch-stamp
+ rm -rf $(DIR)-orig
+ mv $(DIR) $(DIR)-orig
+ mv $(DIR)-new $(DIR)
+ -diff -Naur $(DIR)-orig $(DIR) > $(PATCH)
+ rm -rf $(DIR)-orig
+
+untar-stamp: $(tarballs)
dh_testdir
- tar xfz ispell.tgz
- mkdir -p sl_utils
- ( cd sl_utils ; tar xfz ../sl_utils.tar.gz )
- tar xfz home-lib.tgz
+ for t in $(tarballs) ; do \
+ tar xfz $$t ; \
+ done
+ rm -rf mode/help
+ touch untar-stamp
-patch:
+patch-stamp: untar-stamp
dh_testdir
- @for i in `find patch -name \*.patch` ; do \
- echo Applying patch $$i ; \
- patch -p0 --no-backup-if-mismatch < $$i ; \
+ @for i in `cat patches/00list` ; do \
+ echo Applying patch $$i ; \
+ patch -p0 --no-backup-if-mismatch < patches/$$i ; \
done
+ touch patch-stamp
-byte-compile:
- echo $(sl_files) | eperl compile-files.sl.in -o compile-files.sl
- jed -batch -l ./compile-files.sl
+lib/jed-extra.sl: patch-stamp
+ mkdir -p lib
+ cat `find $(srcdirs) -name \*.rc ` > $@
+compile-files.sl: lib/jed-extra.sl compile-files.sl.in
+ find $(srcdirs) -name \*.sl | grep -v apsconf \
+ | eperl compile-files.sl.in -o compile-files.sl
+
+byte-compile-stamp: compile-files.sl
+ jed -batch -n -l ./compile-files.sl
+ touch byte-compile-stamp
+
build: build-stamp
-build-stamp: untar patch byte-compile
+build-stamp: byte-compile-stamp
dh_testdir
+ for ext in html txt ; do \
+ mkdir $$ext ; \
+ cp `find $(srcdirs) -name \*.$$ext` $$ext ; \
+ done
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -rf ispell sl_utils home-lib compile-files.sl build-stamp
+ rm -rf $(srcdirs) compile-files.sl *-stamp html txt README.tar-mode
dh_clean
-install: build
+install: install-stamp
+install-stamp: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs $(site_lib_dir) $(jed_init_dir)
+ dh_installdirs $(site_lib_dir) $(jed_init_dir) $(a2ps_ssh_dir)
- install --mode=644 $(sl_files) $(slc_files) $(debroot)$(site_lib_dir)
- install --mode=644 home-lib/home-lib.sl \
- $(debroot)$(jed_init_dir)/05home-lib.sl
- install --mode=644 ispell/ispell_init.sl \
- $(debroot)$(jed_init_dir)/55ispell.sl
+ install --mode=644 \
+ `find $(srcdirs) -name \*.sl -o -name \*.slc \
+ -o -name \*.hlp | grep -v colors/ \
+ | grep -v apsconf/ ` \
+ $(debroot)$(site_lib_dir)
+ install --mode=644 mode/a2ps/*.ssh $(debroot)$(a2ps_ssh_dir)
+ cp -a mode/apsmode/apsconf $(debroot)$(site_lib_dir)
+ cp -a mode/colors $(debroot)$(site_lib_dir)/colors
+ cp -a txt $(debroot)$(site_lib_dir)/txt
+ cp mode/tar/INSTALL README.tar-mode
+ chmod -x $(debroot)$(site_lib_dir)/apsconf/*
+ install --mode=644 init/*.sl $(debroot)$(jed_init_dir)
+ install --mode=644 mode/home-lib/home-lib.sl \
+ $(debroot)$(jed_init_dir)/05home-lib.sl
+ touch install-stamp
-# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
dh_testdir
dh_testroot
dh_installchangelogs
- dh_installdocs
-# dh_installexamples
-# dh_install
-# dh_installmenu
+ dh_installdocs html README.tar-mode
# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_installman
-# dh_link
-# dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -105,5 +113,6 @@
# We have nothing to do by default.
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install untar patch \
- byte-compile
+
+.PHONY: build clean binary-indep binary-arch binary install untar byte-compile
+
Property changes on: trunk/packages/jed-extra/debian/rules
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: trunk/packages/jed-extra/home-lib.tgz
===================================================================
(Binary files differ)
Added: trunk/packages/jed-extra/init/50jed-extra.sl
===================================================================
--- trunk/packages/jed-extra/init/50jed-extra.sl 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/init/50jed-extra.sl 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1 @@
+() = evalfile ("jed-extra");
Added: trunk/packages/jed-extra/init/55ispell.sl
===================================================================
--- trunk/packages/jed-extra/init/55ispell.sl 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/init/55ispell.sl 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1 @@
+() = evalfile ("ispell_init");
Deleted: trunk/packages/jed-extra/ispell.tgz
===================================================================
(Binary files differ)
Copied: trunk/packages/jed-extra/patches (from rev 20, trunk/packages/jed-extra/patch)
Added: trunk/packages/jed-extra/patches/00list
===================================================================
--- trunk/packages/jed-extra/patch/00list 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/00list 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,13 @@
+rc-files.patch
+apsconf-tmp-dir.patch
+view-mode-require-keydefs.patch
+ding-require-txtutils-csvutils.patch
+gnuplot-use-jedmodes-info.patch
+gnuplot-shell-cmd-on-region.patch
+ishell-autoload-view-mode.patch
+jedscape-requires.patch
+make-dfa-fixes.patch
+miscfun-autoload-view-mode.patch
+rfcview-require-bufutils.patch
+tree-dfa-fixes.patch
+yodl-require.patch
Deleted: trunk/packages/jed-extra/patches/01-ispell-hash-name.patch
===================================================================
--- trunk/packages/jed-extra/patch/01-ispell-hash-name.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/01-ispell-hash-name.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,11 +0,0 @@
---- ispell-orig/ispell_common.sl 2003-07-14 23:33:23.000000000 +0200
-+++ ispell/ispell_common.sl 2003-07-14 23:34:48.000000000 +0200
-@@ -45,7 +45,7 @@
- ispell_wordlist = Ispell_Wordlist [ispell_current_dictionary];
-
- if (ispell_current_dictionary != "default")
-- ispell_options += " -d " + ispell_current_dictionary;
-+ ispell_options += " -d " + Ispell_Hash_Name[ispell_current_dictionary];
-
- if (Ispell_Extchar [ispell_current_dictionary] != "")
- ispell_options += " -T " + Ispell_Extchar [ispell_current_dictionary];
Deleted: trunk/packages/jed-extra/patches/02-ispell-space-option.patch
===================================================================
--- trunk/packages/jed-extra/patch/02-ispell-space-option.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/02-ispell-space-option.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,12 +0,0 @@
---- ispell/ispell_common.sl 2003-09-09 08:08:43.000000000 +0200
-+++ ispell-new/ispell_common.sl 2003-09-15 17:48:35.000000000 +0200
-@@ -48,7 +48,8 @@
- ispell_options += " -d " + Ispell_Hash_Name[ispell_current_dictionary];
-
- if (Ispell_Extchar [ispell_current_dictionary] != "")
-- ispell_options += " -T " + Ispell_Extchar [ispell_current_dictionary];
-+ ispell_options += " -T " + Ispell_Extchar [ispell_current_dictionary]
-+ + " ";
-
- % extra options come last
- ispell_options += Ispell_Options [ispell_current_dictionary];
Deleted: trunk/packages/jed-extra/patches/03-fix-home-jedrc.patch
===================================================================
--- trunk/packages/jed-extra/patch/03-fix-home-jedrc.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/03-fix-home-jedrc.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,27 +0,0 @@
---- home-lib/home-lib.sl 2003-09-23 18:27:35.000000000 +0200
-+++ home-lib-new/home-lib.sl 2003-09-23 18:29:41.000000000 +0200
-@@ -40,8 +40,22 @@
- % Jed_Home_Directory is defined in site.sl, defaulting to $HOME
- % If Jed_Home_Directory/.jed/ exists, point Jed_Home_Directory there,
- $1 = path_concat(Jed_Home_Directory, ".jed");
--if(2 == file_status($1))
-- Jed_Home_Directory = $1;
-+if(2 == file_status($1)) {
-+ $2 = dircat(Jed_Home_Directory, ".jedrc");
-+ Jed_Home_Directory = $1;
-+
-+ if (1 == file_status($2) )
-+ Default_Jedrc_Startup_File = $2;
-+ else
-+ foreach ( ["jed.rc", "jedrc"] ) {
-+ $1= dircat(Jed_Home_Directory, ());
-+ if (1 == file_status($1)) {
-+ Default_Jedrc_Startup_File = $1;
-+ break;
-+ }
-+ }
-+}
-+
- if(2 == file_status(Jed_Home_Directory)) % directory does exist
- {
- % documentation on library functions is under doc/txt/libfuns.txt
Deleted: trunk/packages/jed-extra/patches/04-dircat-stack-order.patch
===================================================================
--- trunk/packages/jed-extra/patch/04-dircat-stack-order.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/04-dircat-stack-order.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -1,13 +0,0 @@
---- home-lib/home-lib.sl 2003-09-26 17:39:34.000000000 +0200
-+++ home-lib-new/home-lib.sl 2003-09-26 17:32:02.000000000 +0200
-@@ -48,7 +48,9 @@
- Default_Jedrc_Startup_File = $2;
- else
- foreach ( ["jed.rc", "jedrc"] ) {
-- $1= dircat(Jed_Home_Directory, ());
-+ Jed_Home_Directory;
-+ exch();
-+ $1 = dircat();
- if (1 == file_status($1)) {
- Default_Jedrc_Startup_File = $1;
- break;
Added: trunk/packages/jed-extra/patches/apsconf-tmp-dir.patch
===================================================================
--- trunk/packages/jed-extra/patch/apsconf-tmp-dir.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/apsconf-tmp-dir.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,14 @@
+diff -Naur mode-orig/apsmode/apsconf/apsconf.sl mode/apsmode/apsconf/apsconf.sl
+--- mode-orig/apsmode/apsconf/apsconf.sl 2004-11-15 13:35:56.000000000 +0100
++++ mode/apsmode/apsconf/apsconf.sl 2005-03-05 15:50:11.000000000 +0100
+@@ -53,7 +53,9 @@
+ aps_del_ps_file = 1;
+
+ #ifdef UNIX
+-aps_tmp_dir = "/home/xyz/tmp/";
++aps_tmp_dir = getenv ("TMPDIR") + "/";
++if (aps_tmp_dir == "/")
++ aps_tmp_dir = "/tmp/";
+ a2ps_cmd = "a2ps";
+ default_printer = 5;
+ #endif
Added: trunk/packages/jed-extra/patches/ding-require-txtutils-csvutils.patch
===================================================================
--- trunk/packages/jed-extra/patch/ding-require-txtutils-csvutils.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/ding-require-txtutils-csvutils.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,13 @@
+diff -Naur mode-orig/ding/ding.sl mode/ding/ding.sl
+--- mode-orig/ding/ding.sl 2004-11-15 13:36:00.000000000 +0100
++++ mode/ding/ding.sl 2005-03-06 13:58:18.000000000 +0100
+@@ -28,7 +28,8 @@
+ %
+ % Optionally change custom variables
+
+-
++require ("txtutils");
++require ("csvutils");
+
+ % debug information, comment these out when ready
+ _debug_info = 1;
Added: trunk/packages/jed-extra/patches/gnuplot-shell-cmd-on-region.patch
===================================================================
--- trunk/packages/jed-extra/patch/gnuplot-shell-cmd-on-region.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/gnuplot-shell-cmd-on-region.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,39 @@
+diff -Naur mode-orig/gnuplot/gnuplot.sl mode/gnuplot/gnuplot.sl
+--- mode-orig/gnuplot/gnuplot.sl 2005-03-06 15:07:05.000000000 +0100
++++ mode/gnuplot/gnuplot.sl 2005-03-06 15:07:00.000000000 +0100
+@@ -49,7 +49,7 @@
+ % requirements
+ require("comments"); % from jed's standard library
+ autoload ("find_dir", "info");
+-autoload ("do_shell_cmd_on_region", "ishell.sl");
++autoload ("shell_cmd_on_region", "ishell.sl");
+ autoload ("ishell_mode", "ishell.sl");
+
+ % --- user adjustable settings ------------------------------------
+@@ -269,7 +269,7 @@
+ %!%-
+ public define gnuplot_run ()
+ {
+- do_shell_cmd_on_region (Gnuplot_Command);
++ shell_cmd_on_region (Gnuplot_Command);
+ set_buffer_modified_flag (0); % so delbuf doesnot ask whether to save first
+ % now we are in the "*shell-output*" buffer
+ !if (bobp and eobp) % if there is any output
+@@ -354,7 +354,7 @@
+ }
+ % run gnuplot
+ set_prefix_argument(2); % ignore output
+- do_shell_cmd_on_region(Gnuplot_Command);
++ shell_cmd_on_region(Gnuplot_Command);
+
+ % clean up
+ set_buffer_modified_flag(0); % so delbuf doesnot ask whether to save first
+@@ -405,7 +405,7 @@
+
+ % run gnuplot
+ set_prefix_argument(2); % ignore output
+- do_shell_cmd_on_region (Gnuplot_Command);
++ shell_cmd_on_region (Gnuplot_Command);
+
+ % clean up
+ set_buffer_modified_flag (0); % so delbuf doesnot ask whether to save first
Added: trunk/packages/jed-extra/patches/gnuplot-use-jedmodes-info.patch
===================================================================
--- trunk/packages/jed-extra/patch/gnuplot-use-jedmodes-info.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/gnuplot-use-jedmodes-info.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,30 @@
+diff -Naur mode-orig/gnuplot/gnuplot.sl mode/gnuplot/gnuplot.sl
+--- mode-orig/gnuplot/gnuplot.sl 2004-11-15 13:36:02.000000000 +0100
++++ mode/gnuplot/gnuplot.sl 2005-03-06 14:52:24.000000000 +0100
+@@ -48,11 +48,9 @@
+
+ % requirements
+ require("comments"); % from jed's standard library
++autoload ("find_dir", "info");
+ autoload ("do_shell_cmd_on_region", "ishell.sl");
+ autoload ("ishell_mode", "ishell.sl");
+-!if (is_defined ("info_find_dir"))
+- () = evalfile("info.sl"); % has no provides command :-(
+-
+
+ % --- user adjustable settings ------------------------------------
+
+@@ -168,11 +166,11 @@
+ %\usage{Void gnuplot_info (); }
+ %\description
+ % open info and goto node (gnuplot), an optional argument is subnode
+-%\seealso{info_find_dir, info_find_node, gnuplot_mode}
++%\seealso{find_dir, info_find_node, gnuplot_mode}
+ %!%-
+ define gnuplot_info ()
+ {
+- info_find_dir();
++ find_dir();
+ info_find_node("(gnuplot)");
+ if (_NARGS) % optional argument present
+ {
Added: trunk/packages/jed-extra/patches/ishell-autoload-view-mode.patch
===================================================================
--- trunk/packages/jed-extra/patch/ishell-autoload-view-mode.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/ishell-autoload-view-mode.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,11 @@
+diff -Naur mode-orig/ishell/ishell.sl mode/ishell/ishell.sl
+--- mode-orig/ishell/ishell.sl 2004-12-03 11:58:12.000000000 +0100
++++ mode/ishell/ishell.sl 2005-03-06 15:11:56.000000000 +0100
+@@ -108,6 +108,7 @@
+ autoload("run_blocal_hook", "bufutils");
+ autoload("bufsubfile", "bufutils");
+ % autoload("strbreak", "strutils");
++autoload("view_mode", "view");
+
+ % ------------------ custom variables ---------------------------------
+
Added: trunk/packages/jed-extra/patches/jedscape-requires.patch
===================================================================
--- trunk/packages/jed-extra/patch/jedscape-requires.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/jedscape-requires.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,13 @@
+diff -Naur mode-orig/jedscape/jedscape.sl mode/jedscape/jedscape.sl
+--- mode-orig/jedscape/jedscape.sl 2004-11-15 13:36:04.000000000 +0100
++++ mode/jedscape/jedscape.sl 2005-03-06 22:18:14.000000000 +0100
+@@ -33,6 +33,9 @@
+ % anything defined in this file.
+ require("ishell");
+ require("view");
++autoload ("string_nth_match", "strutils");
++autoload ("dired_read_dir", "dired");
++autoload ("strread_file", "bufutils");
+ if (_featurep("jedscape"))
+ use_namespace("jedscape");
+ else
Added: trunk/packages/jed-extra/patches/make-dfa-fixes.patch
===================================================================
--- trunk/packages/jed-extra/patch/make-dfa-fixes.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/make-dfa-fixes.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,47 @@
+diff -Naur mode-orig/make/make.sl mode/make/make.sl
+--- mode-orig/make/make.sl 2004-11-15 13:36:05.000000000 +0100
++++ mode/make/make.sl 2005-03-06 23:14:40.000000000 +0100
+@@ -211,23 +211,26 @@
+ % in JED is seriously damaged. Or, alternatively (and probably),
+ % I don't know how to write good rules :(
+ %
+-define_highlight_rule("\"[^\"]*\"", "string", $0);
+-define_highlight_rule("'[^']*'", "string", $0);
+-%define_highlight_rule("\"([^\"\\\\]|\\\\.)*\"", "string", $0);
+-%define_highlight_rule("\"([^\"\\\\]|\\\\.)*\\\\?$", "string", $0);
+-%define_highlight_rule("'([^'\\\\]|\\\\.)*'", "Qstring", $0);
+-%define_highlight_rule("'([^'\\\\]|\\\\.)*\\\\?$", "string", $0);
+-define_highlight_rule ("^[ \t]*@", "string", $0);
+-define_highlight_rule ("[ \t]*\\\\[ \t]*$", "string", $0);
+-define_highlight_rule ("[ \t]*#.*$", "comment", $0);
+-define_highlight_rule ("[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
+-%define_highlight_rule ("[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
+-%define_highlight_rule ("^[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
+-define_highlight_rule ("^[^\"']*\\:$", "keyword1", $0);
+-define_highlight_rule ("^[^\"']*\\:[ \t]+", "keyword1", $0);
+-%define_highlight_rule ("[ \t]*\.PHONY.*", "keyword1", $0);
+-define_highlight_rule ("/include", "normal", $0);
+-build_highlight_table ($0);
++dfa_define_highlight_rule("\"[^\"]*\"", "string", $0);
++dfa_define_highlight_rule("'[^']*'", "string", $0);
++%dfa_define_highlight_rule("\"([^\"\\\\]|\\\\.)*\"", "string", $0);
++%dfa_define_highlight_rule("\"([^\"\\\\]|\\\\.)*\\\\?$", "string", $0);
++%dfa_define_highlight_rule("'([^'\\\\]|\\\\.)*'", "Qstring", $0);
++%dfa_define_highlight_rule("'([^'\\\\]|\\\\.)*\\\\?$", "string", $0);
++%dfa_define_highlight_rule ("^[ \t]*@", "string", $0);
++%dfa_define_highlight_rule ("[ \t]*\\\\[ \t]*$", "string", $0);
++dfa_define_highlight_rule ("[ \t]*#.*$", "comment", $0);
++%dfa_define_highlight_rule ("[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
++%dfa_define_highlight_rule ("[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
++%dfa_define_highlight_rule ("^[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
++dfa_define_highlight_rule ("^[^\"']*\\:$", "keyword1", $0);
++dfa_define_highlight_rule ("^[^\"']*\\:[ \t]+", "keyword1", $0);
++dfa_define_highlight_rule ("^[^\t][^=]*=[ \t]+", "preprocess", $0);
++dfa_define_highlight_rule ("\\$\\([^\\)]+\\)", "string", $0);
++%dfa_define_highlight_rule ("[ \t]*\.PHONY.*", "keyword1", $0);
++dfa_define_highlight_rule ("/include", "normal", $0);
++dfa_build_highlight_table ($0);
++enable_dfa_syntax_for_mode ($0);
+ #endif
+
+ () = define_keywords_n ($0, "ARASCCCOCPFCPCRMfiif", 2, 0);
Added: trunk/packages/jed-extra/patches/miscfun-autoload-view-mode.patch
===================================================================
--- trunk/packages/jed-extra/patch/miscfun-autoload-view-mode.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/miscfun-autoload-view-mode.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,12 @@
+diff -Naur mode-orig/miscfun/miscfun.sl mode/miscfun/miscfun.sl
+--- mode-orig/miscfun/miscfun.sl 2004-11-15 13:36:06.000000000 +0100
++++ mode/miscfun/miscfun.sl 2005-03-07 21:55:45.000000000 +0100
+@@ -9,6 +9,8 @@
+ % look through the file, copy functions you find useful to your own
+ % miscfun.sl and follow the installation instructions.
+
++autoload ("view_mode", "view");
++
+ %{{{ complete_filename
+ % This is basically the ashell_completion() function for completing
+ % filenames from ashell.sl, minus the ashell-specific stuff.
Added: trunk/packages/jed-extra/patches/rc-files.patch
===================================================================
--- trunk/packages/jed-extra/patch/rc-files.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/rc-files.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,480 @@
+diff -Naur mode-orig/a2ps/a2ps.rc mode/a2ps/a2ps.rc
+--- mode-orig/a2ps/a2ps.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/a2ps/a2ps.rc 2005-03-05 15:49:50.000000000 +0100
+@@ -0,0 +1,4 @@
++autoload ("string_get_match", "strutils");
++autoload ("rebind", "bufutils");
++autoload ("a2ps_mode", "a2ps");
++add_mode_for_extension ("a2ps", "ssh");
+diff -Naur mode-orig/apsmode/apsmode.rc mode/apsmode/apsmode.rc
+--- mode-orig/apsmode/apsmode.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/apsmode/apsmode.rc 2005-03-05 15:50:00.000000000 +0100
+@@ -0,0 +1,10 @@
++foreach (["print_buffer",
++ "print_region",
++ "print_buffer_preview",
++ "print_region_preview",
++ "show_print_log",
++ "aps_help"]) {
++ variable f = ();
++ autoload (f, "apsmode");
++ add_completion (f);
++}
+diff -Naur mode-orig/autotext/autotext.rc mode/autotext/autotext.rc
+--- mode-orig/autotext/autotext.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/autotext/autotext.rc 2005-03-05 16:59:06.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("complete_autotext", "autotext");
++add_completion ("complete_autotext");
+diff -Naur mode-orig/brief/brief.rc mode/brief/brief.rc
+--- mode-orig/brief/brief.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/brief/brief.rc 2005-03-06 01:23:55.000000000 +0100
+@@ -0,0 +1,5 @@
++define brief_emulation () {
++ custom_variable ("ALT_CHAR", 27);
++ () = evalfile ("brief");
++}
++add_completion ("brief_emulation");
+diff -Naur mode-orig/browse_url/browse_url.rc mode/browse_url/browse_url.rc
+--- mode-orig/browse_url/browse_url.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/browse_url/browse_url.rc 2005-03-06 01:46:02.000000000 +0100
+@@ -0,0 +1,8 @@
++foreach (["find_url",
++ "view_url",
++ "browse_url_x",
++ "browse_url"]) {
++ variable func = ();
++ autoload (func, "browse_url");
++ add_completion (func);
++}
+diff -Naur mode-orig/bufed/bufed.rc mode/bufed/bufed.rc
+--- mode-orig/bufed/bufed.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/bufed/bufed.rc 2005-03-06 10:12:54.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("bufed", "bufed");
++add_completion ("bufed");
+diff -Naur mode-orig/bufutils/bufutils.rc mode/bufutils/bufutils.rc
+--- mode-orig/bufutils/bufutils.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/bufutils/bufutils.rc 2005-03-06 10:39:43.000000000 +0100
+@@ -0,0 +1,8 @@
++foreach (["run_buffer",
++ "fit_window",
++ "close_buffer",
++ "reload_buffer"]) {
++ variable func = ();
++ autoload (func, "bufutils");
++ add_completion (func);
++}
+diff -Naur mode-orig/calc/calc.rc mode/calc/calc.rc
+--- mode-orig/calc/calc.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/calc/calc.rc 2005-03-06 11:00:36.000000000 +0100
+@@ -0,0 +1,5 @@
++foreach (["calc", "calc2"]) {
++ variable func = ();
++ autoload (func, "calc.sl");
++ add_completion (func);
++}
+diff -Naur mode-orig/cdecl/cdecl.rc mode/cdecl/cdecl.rc
+--- mode-orig/cdecl/cdecl.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/cdecl/cdecl.rc 2005-03-06 11:30:34.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("cdecl", "cdecl");
++add_completion ("cdecl");
+diff -Naur mode-orig/ch_table/ch_table.rc mode/ch_table/ch_table.rc
+--- mode-orig/ch_table/ch_table.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/ch_table/ch_table.rc 2005-03-06 11:40:15.000000000 +0100
+@@ -0,0 +1,9 @@
++define ct_load_popup_hook (menubar)
++{
++ menu_insert_item ("&Rectangles", "Global.&Edit",
++ "&Special Chars", "special_chars");
++}
++append_to_hook ("load_popup_hooks", &ct_load_popup_hook);
++autoload ("ch_table", "ch_table.sl");
++autoload ("special_chars", "ch_table.sl");
++add_completion ("special_chars");
+--- mode-orig/css1/css1.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/css1/css1.rc 2005-03-06 12:25:48.000000000 +0100
+@@ -0,0 +1,4 @@
++autoload ("css1_mode", "css1");
++add_completion ("css1_mode");
++add_mode_for_extension ("css1", "css");
++add_mode_for_extension ("css1", "css1");
+diff -Naur mode-orig/cua/cua.rc mode/cua/cua.rc
+--- mode-orig/cua/cua.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/cua/cua.rc 2005-03-06 12:35:58.000000000 +0100
+@@ -0,0 +1,4 @@
++define cua_emulation () {
++ () = evalfile ("cua");
++}
++add_completion ("cua_emulation");
+diff -Naur mode-orig/cuamark/cuamark.rc mode/cuamark/cuamark.rc
+--- mode-orig/cuamark/cuamark.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/cuamark/cuamark.rc 2005-03-06 13:02:28.000000000 +0100
+@@ -0,0 +1,4 @@
++public define cuamark_style () {
++ () = evalfile ("cuamark");
++}
++add_completion ("cuamark_style");
+diff -Naur mode-orig/custmode/custmode.rc mode/custmode/custmode.rc
+--- mode-orig/custmode/custmode.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/custmode/custmode.rc 2005-03-06 13:09:34.000000000 +0100
+@@ -0,0 +1 @@
++autoload ("custom_mode", "custmode.sl");
+diff -Naur mode-orig/dabbrev/dabbrev.rc mode/dabbrev/dabbrev.rc
+--- mode-orig/dabbrev/dabbrev.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/dabbrev/dabbrev.rc 2005-03-06 13:25:50.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("dabbrev", "dabbrev");
++add_completion ("dabbrev");
+diff -Naur mode-orig/ding/ding.rc mode/ding/ding.rc
+--- mode-orig/ding/ding.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/ding/ding.rc 2005-03-06 13:49:22.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("ding", "ding");
++add_completion ("ding");
+diff -Naur mode-orig/email/email.rc mode/email/email.rc
+--- mode-orig/email/email.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/email/email.rc 2005-03-06 14:12:08.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("mail_mode", "email");
++add_completion ("mail_mode");
+diff -Naur mode-orig/ffap/ffap.rc mode/ffap/ffap.rc
+--- mode-orig/ffap/ffap.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/ffap/ffap.rc 2005-03-06 14:32:40.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("ffap", "ffap");
++add_completion ("ffap");
+diff -Naur mode-orig/filelist/filelist.rc mode/filelist/filelist.rc
+--- mode-orig/filelist/filelist.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/filelist/filelist.rc 2005-03-06 14:39:35.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("filelist_list_dir", "filelist");
++add_completion ("filelist_list_dir");
+diff -Naur mode-orig/gnuplot/gnuplot.rc mode/gnuplot/gnuplot.rc
+--- mode-orig/gnuplot/gnuplot.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/gnuplot/gnuplot.rc 2005-03-06 14:44:18.000000000 +0100
+@@ -0,0 +1,10 @@
++autoload ("gnuplot_mode", "gnuplot.sl");
++add_mode_for_extension ("gnuplot", "gnuplot");
++add_mode_for_extension ("gnuplot", "gp");
++define gnuplot_mode_hook ()
++{
++ local_setkey ("gnuplot_help", "^Ch", $2); % Help
++ local_setkey ("gnuplot_run", "^Cr", $2); % Alt-Return: Run buffer/region
++ local_setkey ("gnuplot_print", "^Cp", $2); % Print plot
++ local_setkey ("gnuplot_plot", "^Cd", $2); % Display plot
++}
+diff -Naur mode-orig/gpg/gpg.rc mode/gpg/gpg.rc
+--- mode-orig/gpg/gpg.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/gpg/gpg.rc 2005-03-06 15:24:38.000000000 +0100
+@@ -0,0 +1,8 @@
++foreach (["gpg_encrypt",
++ "gpg_decrypt",
++ "gpg_sign",
++ "gpg_forget_password"]) {
++ variable func = ();
++ autoload (func, "gpg");
++ add_completion (func);
++}
+diff -Naur mode-orig/grep/grep.rc mode/grep/grep.rc
+--- mode-orig/grep/grep.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/grep/grep.rc 2005-03-06 15:31:03.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("grep", "grep");
++add_completion ("grep");
+diff -Naur mode-orig/history/history.rc mode/history/history.rc
+--- mode-orig/history/history.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/history/history.rc 2005-03-06 15:38:17.000000000 +0100
+@@ -0,0 +1,7 @@
++foreach (["history_load",
++ "history_save",
++ "history_local_save"]) {
++ variable func = ();
++ autoload (func, "history");
++ add_completion (func);
++}
+diff -Naur mode-orig/howto/howto.rc mode/howto/howto.rc
+--- mode-orig/howto/howto.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/howto/howto.rc 2005-03-06 16:42:28.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("howto_mode", "howto");
++add_completion ("howto_mode");
+diff -Naur mode-orig/hs/hs.rc mode/hs/hs.rc
+--- mode-orig/hs/hs.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/hs/hs.rc 2005-03-06 17:07:55.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("hs_mode", "hs");
++add_completion ("hs_mode");
+diff -Naur mode-orig/hyperhelp/help.rc mode/hyperhelp/help.rc
+--- mode-orig/hyperhelp/help.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/hyperhelp/help.rc 2005-03-06 21:23:15.000000000 +0100
+@@ -0,0 +1,7 @@
++foreach (["help_for_help",
++ "grep_definition",
++ "set_variable"]) {
++ variable func = ();
++ autoload (func, "help");
++ add_completion (func);
++}
+diff -Naur mode-orig/hyperman/hyperman.rc mode/hyperman/hyperman.rc
+--- mode-orig/hyperman/hyperman.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/hyperman/hyperman.rc 2005-03-06 21:26:33.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("unix_man", "hyperman");
++add_completion ("unix_man");
+diff -Naur mode-orig/ishell/ishell.rc mode/ishell/ishell.rc
+--- mode-orig/ishell/ishell.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/ishell/ishell.rc 2005-03-06 21:38:09.000000000 +0100
+@@ -0,0 +1,7 @@
++foreach (["ishell",
++ "ishell_mode",
++ "shell_cmd_on_region"]) {
++ variable func = ();
++ autoload (func, "ishell");
++ add_completion (func);
++}
+diff -Naur mode-orig/jedscape/jedscape.rc mode/jedscape/jedscape.rc
+--- mode-orig/jedscape/jedscape.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/jedscape/jedscape.rc 2005-03-06 22:15:22.000000000 +0100
+@@ -0,0 +1,6 @@
++foreach (["jedscape",
++ "jedscape_get_url"]) {
++ variable func = ();
++ autoload (func, "jedscape");
++ add_completion (func);
++}
+diff -Naur mode-orig/life/life.rc mode/life/life.rc
+--- mode-orig/life/life.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/life/life.rc 2005-03-06 22:38:59.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("life", "life");
++add_completion ("life");
+diff -Naur mode-orig/make/make.rc mode/make/make.rc
+--- mode-orig/make/make.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/make/make.rc 2005-03-06 22:53:30.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("make_mode", "make");
++add_completion ("make_mode");
+diff -Naur mode-orig/make_ini/make_ini.rc mode/make_ini/make_ini.rc
+--- mode-orig/make_ini/make_ini.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/make_ini/make_ini.rc 2005-03-07 09:37:07.000000000 +0100
+@@ -0,0 +1,6 @@
++foreach (["make_ini",
++ "update_ini"]) {
++ variable func = ();
++ autoload (func, "make_ini");
++ add_completion (func);
++}
+diff -Naur mode-orig/manedit/manedit.rc mode/manedit/manedit.rc
+--- mode-orig/manedit/manedit.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/manedit/manedit.rc 2005-03-07 11:30:49.000000000 +0100
+@@ -0,0 +1,6 @@
++autoload ("manedit_mode", "manedit");
++add_completion ("manedit_mode");
++foreach (["man", "1", "2", "3", "4", "5", "6", "7", "8"]) {
++ variable ext = ();
++ add_mode_for_extension ("manedit", ext);
++}
+diff -Naur mode-orig/md5/md5.rc mode/md5/md5.rc
+--- mode-orig/md5/md5.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/md5/md5.rc 2005-03-07 11:33:35.000000000 +0100
+@@ -0,0 +1,7 @@
++foreach (["md5",
++ "md5_region",
++ "md5_buffer"]) {
++ variable func = ();
++ autoload (func, "md5");
++ add_completion (func);
++}
+diff -Naur mode-orig/minued/minued.rc mode/minued/minued.rc
+--- mode-orig/minued/minued.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/minued/minued.rc 2005-03-07 11:40:07.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("minued_mode", "minued");
++add_completion ("minued_mode");
+diff -Naur mode-orig/miscfun/miscfun.rc mode/miscfun/miscfun.rc
+--- mode-orig/miscfun/miscfun.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/miscfun/miscfun.rc 2005-03-07 21:53:29.000000000 +0100
+@@ -0,0 +1,8 @@
++foreach (["complete_filename",
++ "repeat",
++ "smart_format_par",
++ "wdiff"]) {
++ variable func = ();
++ autoload (func, "miscfun");
++ add_completion (func);
++}
+diff -Naur mode-orig/outline/outline.rc mode/outline/outline.rc
+--- mode-orig/outline/outline.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/outline/outline.rc 2005-03-07 22:12:38.000000000 +0100
+@@ -0,0 +1,8 @@
++autoload ("outline_mode", "outline");
++foreach (["outline2html",
++ "normalize_outline",
++ "rolo_grep"]) {
++ variable func = ();
++ autoload (func, "outlinemisc");
++ add_completion (func);
++}
+diff -Naur mode-orig/print/print.rc mode/print/print.rc
+--- mode-orig/print/print.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/print/print.rc 2005-03-07 22:24:55.000000000 +0100
+@@ -0,0 +1,7 @@
++autoload ("print_buffer", "print");
++define print_popup_hook (menubar)
++{
++ menu_insert_separator (6, "Global.&File");
++ menu_insert_item (7, "Global.&File", "&Print Buffer", "print_buffer");
++}
++append_to_hook ("load_popup_hooks", &print_popup_hook);
+diff -Naur mode-orig/recent/recent.rc mode/recent/recent.rc
+--- mode-orig/recent/recent.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/recent/recent.rc 2005-03-07 22:35:19.000000000 +0100
+@@ -0,0 +1,4 @@
++define recent () {
++ () = evalfile ("recent");
++}
++add_completion ("recent");
+diff -Naur mode-orig/rfcview/rfcview.rc mode/rfcview/rfcview.rc
+--- mode-orig/rfcview/rfcview.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/rfcview/rfcview.rc 2005-03-07 23:19:36.000000000 +0100
+@@ -0,0 +1,7 @@
++custom_variable ("Rfc_Path", "/usr/share/doc/RFC/links/");
++custom_variable ("Rfc_Index", "/usr/share/doc/RFC/rfc-index.txt.gz");
++foreach (["rfcview", "rfc_mode"]) {
++ variable func = ();
++ autoload (func, "rfcview");
++ add_completion (func);
++}
+diff -Naur mode-orig/rimini/rimini.rc mode/rimini/rimini.rc
+--- mode-orig/rimini/rimini.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/rimini/rimini.rc 2005-03-07 23:35:15.000000000 +0100
+@@ -0,0 +1,18 @@
++autoload ("mini_isearch", "rimini");
++require ("mini");
++define mini_init_minibuffer ()
++{
++ variable mini = "Mini_Map";
++ !if (keymap_p (mini))
++ make_keymap (mini);
++ definekey ("next_mini_command", "\e[B", mini);
++ definekey ("prev_mini_command", "\e[A", mini);
++ definekey ("next_mini_command", "\eOB", mini);
++ definekey ("prev_mini_command", "\eOA", mini);
++ definekey ("mini_exit_minibuffer", "\r", mini);
++ definekey ("exit_mini", "\e\r", mini);
++ definekey ("mini_complete", "\t", mini);
++ definekey ("mini_complete", " ", mini);
++ definekey ("mini_isearch", "^r", "Mini_Map");
++ eval (".() rimini_init_minibuffer");
++}
+diff -Naur mode-orig/rst/rst.rc mode/rst/rst.rc
+--- mode-orig/rst/rst.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/rst/rst.rc 2005-03-08 07:48:03.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("rst_mode", "rst");
++add_completion ("rst_mode");
+diff -Naur mode-orig/server/server.rc mode/server/server.rc
+--- mode-orig/server/server.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/server/server.rc 2005-03-08 08:18:25.000000000 +0100
+@@ -0,0 +1,5 @@
++foreach (["done", "start"]) {
++ variable f = ();
++ autoload ("server_" + f, "server");
++ add_completion ("server_" + f);
++}
+diff -Naur mode-orig/snake/snake.rc mode/snake/snake.rc
+--- mode-orig/snake/snake.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/snake/snake.rc 2005-03-08 08:24:09.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("snake", "snake");
++add_completion ("snake");
+diff -Naur mode-orig/sql/sql.rc mode/sql/sql.rc
+--- mode-orig/sql/sql.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/sql/sql.rc 2005-03-08 08:30:01.000000000 +0100
+@@ -0,0 +1,12 @@
++foreach (["sql_mode",
++ "sql92_mode",
++ "sql99_mode",
++ "mssql_mode",
++ "mysql_mode",
++ "pgsql_mode",
++ "orsql_mode"]) {
++ variable func = ();
++ autoload (func, "sql");
++ add_completion (func);
++}
++add_mode_for_extension ("sql", "sql");
+diff -Naur mode-orig/tar/tar.rc mode/tar/tar.rc
+--- mode-orig/tar/tar.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/tar/tar.rc 2005-03-08 08:32:21.000000000 +0100
+@@ -0,0 +1 @@
++autoload ("tar", "tar");
+diff -Naur mode-orig/temabbrv/temabbrv.rc mode/temabbrv/temabbrv.rc
+--- mode-orig/temabbrv/temabbrv.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/temabbrv/temabbrv.rc 2005-03-08 08:38:06.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("temabbrev", "temabbrv");
++add_completion ("temabbrev");
+diff -Naur mode-orig/tracker/tracker.rc mode/tracker/tracker.rc
+--- mode-orig/tracker/tracker.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/tracker/tracker.rc 2005-03-08 08:43:14.000000000 +0100
+@@ -0,0 +1,15 @@
++foreach (["tracker_start", "tracker_view"]) {
++ variable func = ();
++ autoload (func, "tracker");
++ add_completion (func);
++}
++static define tracker_load_popup_hook (menubar)
++{
++ variable menu = "Global.S&ystem";
++ menu_append_popup(menu, "&Tracker");
++ menu = "Global.S&ystem.&Tracker";
++ menu_append_item(menu, "&Start", "tracker_start");
++ menu_append_item(menu, "s&Top", "tracker_stop");
++ menu_append_item(menu, "&View", "tracker_view");
++}
++append_to_hook ("load_popup_hooks", &tracker_load_popup_hook);
+diff -Naur mode-orig/tree/tree.rc mode/tree/tree.rc
+--- mode-orig/tree/tree.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/tree/tree.rc 2005-03-08 08:47:37.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("tree", "tree");
++add_completion ("tree");
+diff -Naur mode-orig/turbo/turbo.rc mode/turbo/turbo.rc
+--- mode-orig/turbo/turbo.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/turbo/turbo.rc 2005-03-08 08:55:36.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("turbo_mode", "turbo");
++add_completion ("turbo_mode");
+diff -Naur mode-orig/uri/uri.rc mode/uri/uri.rc
+--- mode-orig/uri/uri.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/uri/uri.rc 2005-03-08 12:36:17.000000000 +0100
+@@ -0,0 +1,5 @@
++foreach (["find_uri", "write_uri"]) {
++ variable func = ();
++ autoload (func, "uri");
++ add_completion (func);
++}
+diff -Naur mode-orig/view/view.rc mode/view/view.rc
+--- mode-orig/view/view.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/view/view.rc 2005-03-08 12:48:44.000000000 +0100
+@@ -0,0 +1,2 @@
++autoload ("view_mode", "view");
++add_completion ("view_mode");
+diff -Naur mode-orig/css1/css1.rc mode/css1/css1.rc
+--- mode-orig/css1/css1.rc 2005-03-08 12:55:20.000000000 +0100
++++ mode/css1/css1.rc 2005-03-08 12:50:18.000000000 +0100
+@@ -1,4 +1,3 @@
+ autoload ("css1_mode", "css1");
+-add_completion ("css1_mode");
+ add_mode_for_extension ("css1", "css");
+ add_mode_for_extension ("css1", "css1");
+diff -Naur mode-orig/yodl/yodl.rc mode/yodl/yodl.rc
+--- mode-orig/yodl/yodl.rc 1970-01-01 01:00:00.000000000 +0100
++++ mode/yodl/yodl.rc 2005-03-08 12:54:43.000000000 +0100
+@@ -0,0 +1,3 @@
++autoload ("yodl_mode", "yodl");
++add_completion ("yodl_mode");
++add_mode_for_extension ("yo", "yodl");
Added: trunk/packages/jed-extra/patches/rfcview-require-bufutils.patch
===================================================================
--- trunk/packages/jed-extra/patch/rfcview-require-bufutils.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/rfcview-require-bufutils.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,11 @@
+diff -Naur mode-orig/rfcview/rfcview.sl mode/rfcview/rfcview.sl
+--- mode-orig/rfcview/rfcview.sl 2004-11-15 13:36:07.000000000 +0100
++++ mode/rfcview/rfcview.sl 2005-03-07 23:19:46.000000000 +0100
+@@ -24,6 +24,7 @@
+ implements("rfcview");
+
+ require("view");
++require("bufutils");
+ _autoload
+ ("set_buffer_hidden", "filter-view",
+ "set_matching_hidden", "filter_view",
Added: trunk/packages/jed-extra/patches/tree-dfa-fixes.patch
===================================================================
--- trunk/packages/jed-extra/patch/tree-dfa-fixes.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/tree-dfa-fixes.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,23 @@
+diff -Naur mode-orig/tree/tree.sl mode/tree/tree.sl
+--- mode-orig/tree/tree.sl 2004-11-15 13:36:08.000000000 +0100
++++ mode/tree/tree.sl 2005-03-08 08:50:00.000000000 +0100
+@@ -349,12 +349,13 @@
+ {
+ $0 = "tree";
+ create_syntax_table ($0);
+- define_highlight_rule(" [^\\|`]* \\-\\> .*$", "Qcomment", $0);
+- define_highlight_rule(" [^\\|`]* \\~\\> .*$", "Qerror", $0);
+- define_highlight_rule(" [^\\|`]*/$", "Qkeyword", $0);
+- define_highlight_rule(" [^\\|`]*\\*$", "Qkeyword1", $0);
+- define_highlight_rule("^[^ ].*$", "Qstring", $0);
+- build_highlight_table ($0);
++ dfa_define_highlight_rule(" [^\\|`]* \\-\\> .*$", "Qcomment", $0);
++ dfa_define_highlight_rule(" [^\\|`]* \\~\\> .*$", "Qerror", $0);
++ dfa_define_highlight_rule(" [^\\|`]*/$", "Qkeyword", $0);
++ dfa_define_highlight_rule(" [^\\|`]*\\*$", "Qkeyword1", $0);
++ dfa_define_highlight_rule("^[^ ].*$", "Qstring", $0);
++ dfa_build_highlight_table ($0);
++ enable_dfa_syntax_for_mode ($0);
+ use_syntax_table ("tree");
+ }
+ #endif
Added: trunk/packages/jed-extra/patches/view-mode-require-keydefs.patch
===================================================================
--- trunk/packages/jed-extra/patch/view-mode-require-keydefs.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/view-mode-require-keydefs.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,12 @@
+diff -Naur mode-orig/view/view.sl mode/view/view.sl
+--- mode-orig/view/view.sl 2004-11-15 13:36:08.000000000 +0100
++++ mode/view/view.sl 2005-03-06 11:56:22.000000000 +0100
+@@ -12,6 +12,8 @@
+
+ % requirements
+
++require ("keydefs");
++
+ autoload("close_buffer", "bufutils");
+ autoload("set_help_message", "bufutils");
+ autoload("help_message", "bufutils");
Added: trunk/packages/jed-extra/patches/yodl-require.patch
===================================================================
--- trunk/packages/jed-extra/patch/yodl-require.patch 2005-03-16 16:55:46 UTC (rev 20)
+++ trunk/packages/jed-extra/patches/yodl-require.patch 2005-03-19 08:47:42 UTC (rev 21)
@@ -0,0 +1,14 @@
+diff -Naur mode-orig/yodl/yodl.sl mode/yodl/yodl.sl
+--- mode-orig/yodl/yodl.sl 2004-11-15 13:36:09.000000000 +0100
++++ mode/yodl/yodl.sl 2005-03-08 12:58:16.000000000 +0100
+@@ -7,6 +7,10 @@
+ % Copyright (c) 2004 Paul Boekholt.
+ % Released under the terms of the GNU GPL (version 2 or later).
+
++require ("txtutils");
++require ("bufutils");
++require ("help");
++
+ if (_featurep("yodl"))
+ use_namespace("yodl");
+ else
Deleted: trunk/packages/jed-extra/sl_utils.tar.gz
===================================================================
(Binary files differ)