[Pkg-jed-commit] r941 - in jed-extra/trunk: debian debian/examples debian/patches utils
Guenter Milde
milde-guest at alioth.debian.org
Thu Oct 18 16:38:21 UTC 2007
tags 446271 pending
thanks
Author: milde-guest
Date: 2007-10-18 16:38:21 +0000 (Thu, 18 Oct 2007)
New Revision: 941
Removed:
jed-extra/trunk/debian/patches/01_help.sl-enable-dfa.dpatch
Modified:
jed-extra/trunk/debian/changelog
jed-extra/trunk/debian/examples/50jed-extra.sl
jed-extra/trunk/debian/jed-extra-preparse.sl
jed-extra/trunk/debian/patches/00list
jed-extra/trunk/debian/rules
jed-extra/trunk/utils/build-from-svn-copy.sh
Log:
new upstream pre-release
Modified: jed-extra/trunk/debian/changelog
===================================================================
--- jed-extra/trunk/debian/changelog 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/debian/changelog 2007-10-18 16:38:21 UTC (rev 941)
@@ -1,7 +1,16 @@
-jed-extra (2.4.2-2) UNRELEASED; urgency=low
+jed-extra (2.4.2pre3-1) DO-NOT-RELEASE; urgency=low
+ * New upstream release:
+ * fix activation of optional extensions
+ (e.g. navigating in the help browser with "," and "." keys),
+ * rst.sl: fix tokenlist interface so that Mode>Navigate works again,
+ * help.sl: enable-dfa patch applied upstream,
+ * libdir.sl: use add_doc_file() (closes: #446271).
* Remove generated files at every install or removal
- (Also removes spurious ini.sl~ files from bug #440262)
+ (Also removes spurious ini.sl~ files from bug #440262).
+ * Create the System>Ispell menu popup in 50jed-extra.sl
+ -- Guenter Milde <milde at users.sf.net> Thu, 18 Oct 2007 17:40:43 +0200
+
jed-extra (2.4.2-1) unstable; urgency=low
[ Guenter Milde ]
Modified: jed-extra/trunk/debian/examples/50jed-extra.sl
===================================================================
--- jed-extra/trunk/debian/examples/50jed-extra.sl 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/debian/examples/50jed-extra.sl 2007-10-18 16:38:21 UTC (rev 941)
@@ -61,6 +61,20 @@
add_mode_for_extension ("ruby", "rb");
add_mode_for_extension ("sql", "sql");
+% Update the System>Ispell menu entry
+autoload("ispell_change_dictionary_callback", "ispell_common");
+static define ispell_load_popup_hook (menubar)
+{
+ variable menu = "Global.S&ystem";
+ menu_delete_item (menu + ".&Ispell");
+ menu_append_popup (menu, "&Ispell");
+ menu = "Global.S&ystem.&Ispell";
+ menu_set_select_popup_callback(menu, &ispell_change_dictionary_callback);
+}
+append_to_hook ("load_popup_hooks", &ispell_load_popup_hook);
+% alternatively:
+% require("ispell_init");
+
% Globally activate extensions
% ----------------------------
Modified: jed-extra/trunk/debian/jed-extra-preparse.sl
===================================================================
--- jed-extra/trunk/debian/jed-extra-preparse.sl 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/debian/jed-extra-preparse.sl 2007-10-18 16:38:21 UTC (rev 941)
@@ -20,7 +20,9 @@
vmessage("jed library path: %s", get_jed_library_path());
-% evaluate required utility functions
+vmessage(expand_jedlib_file("circle.sl"));
+
+% load utility functions
require("make_ini");
% Do not generate autoloads for the following files:
@@ -38,18 +40,19 @@
% Do not save backup copies of the generated files
No_Backups = 1;
+% generate autoloads (but not completions) for all functions in Utils
+Make_ini_Scope = 2;
+Make_ini_Add_Completions = 0;
+update_ini(utils_dir);
+
% preparse modes and generate ini.sl files with autoloads and completions for
% public functions
+Make_ini_Scope = 1;
+Make_ini_Add_Completions = 1;
+
+update_ini(drop_in_dir);
update_ini(lib_dir);
-update_ini(drop_in_dir);
update_ini(extra_dir);
-% generate autoloads (but not completions) for all functions in Utils
-Make_ini_Scope = 2;
-Make_ini_Add_Completions = 0;
-update_ini(utils_dir);
-
% byte compile color files
byte_compile_libdir(colors_dir);
-
-% TODO: create DFA syntax highlight cache files
Modified: jed-extra/trunk/debian/patches/00list
===================================================================
--- jed-extra/trunk/debian/patches/00list 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/debian/patches/00list 2007-10-18 16:38:21 UTC (rev 941)
@@ -1,4 +1,3 @@
#missing_autoload
#apsmode
#ding
-01_help.sl-enable-dfa
Deleted: jed-extra/trunk/debian/patches/01_help.sl-enable-dfa.dpatch
===================================================================
--- jed-extra/trunk/debian/patches/01_help.sl-enable-dfa.dpatch 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/debian/patches/01_help.sl-enable-dfa.dpatch 2007-10-18 16:38:21 UTC (rev 941)
@@ -1,134 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_help.sl-enable-dfa.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from jed-extra 2.4.2-1 diff.gz
-
- at DPATCH@
-
---- jed-extra-2.4.2.orig/hyperhelp/help.sl
-+++ jed-extra-2.4.2/hyperhelp/help.sl
-@@ -75,6 +75,10 @@
- % 1.9.1 2007-05-31 bugfix in where_is(), removed spurious line
- % 1.9.2 2007-10-01 optional extensions with #if ( )
- % 1.9.3 2007-10-04 no DFA highlight in UTF-8 mode (it's broken)
-+% 1.9.4 2007-10-15 re-enabnle DFA highlight, as it is rather unlikely that
-+% help text contains multibyte chars (hint P. Boekholt)
-+% Otherwise, disable it in the help_mode_hook() with
-+% disable_dfa_syntax_for_mode("help");
- %
- % Usage
- % -----
-@@ -183,17 +187,19 @@
- autoload("grep", "grep");
- #endif
-
-+% Announcement and namespace
-+% --------------------------
- % This help browser (with "hyperlinks") is a drop-in replacement for the
- % standard help. Modes depending on extensions in this file should
- % require("hyperhelp", "help.sl").
- provide("help");
- provide("hyperhelp");
-
--% --- name it
- implements("help");
- private variable mode = "help";
-
--% --- variables for user customization ----------------------
-+% Custom variables
-+% ----------------
-
- % How big shall the help window be maximal
- % (set this to 0 if you don't want it to be fitted)
-@@ -205,7 +211,8 @@
- % The standard help file to display with help().
- custom_variable("Help_File", "generic.hlp");
-
--% --- variables ----------------------------------------------
-+% Variables
-+% ---------
-
- % valid chars in function and variable definitions
- static variable Slang_word_chars = "A-Za-z0-9_";
-@@ -269,7 +276,8 @@
- #endif
-
-
--% --- auxiliary functions --------------------------------
-+% Auxiliary Functions
-+% -------------------
-
- % forward declarations
- public define help_mode();
-@@ -378,7 +386,8 @@
- set_readonly(1);
- }
-
--% --- basic help -----------------------------------------------------
-+% Basic Help
-+% ----------
-
- %!%+
- %\function{help}
-@@ -550,7 +559,8 @@
- help_display_list(list[array_sort(list)]);
- }
-
--% --- showkey and helpers
-+% Show Key
-+% --------
-
- % convert string into array of 1-char strings
- % in contrast to bstring_to_array(), the array elements are String_Type
-@@ -688,7 +698,8 @@
- help_display(help_str);
- }
-
--% --- describe function/variable and helpers
-+% Describe Function/Variable
-+% --------------------------
-
- public define is_keyword(name)
- {
-@@ -1235,7 +1246,8 @@
- return(0);
- }
-
--% --- fast moving in the help buffer (link to link skipping)
-+% fast moving in the help buffer (link to link skipping)
-+% ------------------------------------------------------
-
- % skip forward to beg of next word (move this to txtutils.sl?)
- define skip_word() % ([word_chars])
-@@ -1329,7 +1341,8 @@
- }
- }
-
--% --- "syntax" highlighting of "links" (defined objects)
-+% Highlighting of "Links" (defined objects)
-+% -----------------------------------------
-
- #ifdef HAS_DFA_SYNTAX
- create_syntax_table(mode);
-@@ -1348,8 +1361,8 @@
- dfa_set_init_callback(&help_dfa_callback, mode);
- %%% DFA_CACHE_END %%%
-
--!if (_slang_utf8_ok) % DFA is broken in UTF-8 mode
-- enable_dfa_syntax_for_mode(mode);
-+% !if (_slang_utf8_ok) % DFA is broken in UTF-8 mode
-+enable_dfa_syntax_for_mode(mode);
- % keywords will be added by the function help_mark_keywords()
-
- % special syntax table for listings (highlight all words in keyword colour)
-@@ -1404,7 +1417,8 @@
- pop_spot();
- }
-
--% --- A dedicated mode for the help buffer -------------------------------
-+% Help Mode
-+% ---------
-
- % Keybindings (customize with help_mode_hook)
- !if (keymap_p (mode))
Modified: jed-extra/trunk/debian/rules
===================================================================
--- jed-extra/trunk/debian/rules 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/debian/rules 2007-10-18 16:38:21 UTC (rev 941)
@@ -35,7 +35,7 @@
WGET = wget -N
# URL of the upstream source package
-UPSTREAM_VERSION ?= $(shell perl -ne '/([\d.]+)-?/; print $$1; exit' < debian/changelog)
+UPSTREAM_VERSION ?= $(shell perl -ne '/([\d.]+[pre]*\d*)-?/; print $$1; exit' < debian/changelog)
UPSTREAM_PACKAGE = jedmodes-$(UPSTREAM_VERSION).tgz
UPSTREAM_PACKAGE_CHECKSUM = jedmodes-$(UPSTREAM_VERSION).md5sum
# pre-release (source tarball from the jedmodes home site)
@@ -48,8 +48,10 @@
# Choose source
# -------------
-UPSTREAM_URL = $(RELEASE_URL)
-# UPSTREAM_URL = $(PRERELEASE_URL)
+# TODO: auto-select PRERELEASE_URL if UPSTREAM_VERSION contains "pre"
+
+# UPSTREAM_URL = $(RELEASE_URL)
+UPSTREAM_URL = $(PRERELEASE_URL)
# UPSTREAM_URL = $(LOCAL_RELEASE_URL)
# Rules
Modified: jed-extra/trunk/utils/build-from-svn-copy.sh
===================================================================
--- jed-extra/trunk/utils/build-from-svn-copy.sh 2007-10-18 16:28:14 UTC (rev 940)
+++ jed-extra/trunk/utils/build-from-svn-copy.sh 2007-10-18 16:38:21 UTC (rev 941)
@@ -27,7 +27,7 @@
fi
# upstream version
-UPSTREAM_VERSION=`perl -ne '/\(([\d.]+)-?/; print $1; exit' < debian/changelog`
+UPSTREAM_VERSION=`perl -ne '/\(([\d.pre]+)-?/; print $1; exit' < debian/changelog`
echo "building jed-extra ($UPSTREAM_VERSION)"
@@ -39,17 +39,16 @@
# Remove old patches / old build-dir
# ----------------------------------
-
# remove old dir (if left over)
-# rm -Rf jedmodes-$UPSTREAM_VERSION
-if [ -e jedmodes-$UPSTREAM_VERSION ]
- then rm -Rf jedmodes-$UPSTREAM_VERSION.bak
- mv -f jedmodes-$UPSTREAM_VERSION jedmodes-$UPSTREAM_VERSION.bak
-
-fi
+rm -Rf jedmodes-$UPSTREAM_VERSION
-# or just the patches
+# or keep one backup copy
+# if [ -e jedmodes-$UPSTREAM_VERSION ]
+# then rm -Rf jedmodes-$UPSTREAM_VERSION.bak
+# mv -f jedmodes-$UPSTREAM_VERSION jedmodes-$UPSTREAM_VERSION.bak
+# fi
+# or remove just the patches
# rm -rf jedmodes-$UPSTREAM_VERSION/patch-stamp jedmodes-$UPSTREAM_VERSION/patch-stampT \
# jedmodes-$UPSTREAM_VERSION/debian/patched
More information about the Pkg-jed-commit
mailing list