[Pkg-jed-commit] [SCM] Debian packaging of JED branch, 0.99.19, updated. 1%3A0.99.18+dfsg.1-10-182-gdba9171
Jörg Sommer
joerg at alea.gnuu.de
Sat May 24 12:47:55 UTC 2008
The following commit has been merged in the 0.99.19 branch:
commit 6cd29ccd3347e34bf97a43be57d176d2aabbbb78
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date: Sat May 24 13:30:56 2008 +0200
Remove obsolate dpatches; they are applied upstream
add-describe-bindings-to-C-h.dpatch 0.99.19~pre62
extend-jed_faq.dpatch 0.99.19~pre136
extend-help.sl.dpatch 0.99.19~pre134
extend-manpage.dpatch 0.99.19~pre135
fix-documentation.dpatch 0.99.19~pre132
fix-help.sl.dpatch 0.99.19~pre134
fix-jed-doc-file.dpatch 0.99.19~pre137
fix-pymode-tab-space.dpatch 0.99.19~pre59
fix-update-before-key-hook.dpatch 0.99.19~pre133
highlight-isearch-results.dpatch 0.99.19~pre24
pymode-repeat-shift.dpatch 0.99.19~pre59
remove_jed_library_path.dpatch 0.99.19~pre138
sane-color-object-return.dpatch 0.99.19~pre16
diff --git a/debian/changelog b/debian/changelog
index a2f1b12..2e44634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,21 @@ jed (1:0.99.19~pre138-1) UNRELEASED; urgency=low
(Joerg Sommer). (closes: #473617)
* Merged the changes from the unstable release branch.
+ + Removed the following dpatches introduced by this merge. because
+ they are applied upstream:
+ - add-describe-bindings-to-C-h.dpatch 0.99.19~pre62
+ - extend-jed_faq.dpatch 0.99.19~pre136
+ - extend-help.sl.dpatch 0.99.19~pre134
+ - extend-manpage.dpatch 0.99.19~pre135
+ - fix-documentation.dpatch 0.99.19~pre132
+ - fix-help.sl.dpatch 0.99.19~pre134
+ - fix-jed-doc-file.dpatch 0.99.19~pre137
+ - fix-pymode-tab-space.dpatch 0.99.19~pre59
+ - fix-update-before-key-hook.dpatch 0.99.19~pre133
+ - highlight-isearch-results.dpatch 0.99.19~pre24
+ - pymode-repeat-shift.dpatch 0.99.19~pre59
+ - remove_jed_library_path.dpatch 0.99.19~pre138
+ - sane-color-object-return.dpatch 0.99.19~pre16
-- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
diff --git a/debian/patches/00list b/debian/patches/00list
index 098ab43..ec830f8 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,3 @@
-extend-manpage
-
50_README
50_jed-manpage
@@ -13,17 +11,5 @@ extend-manpage
60_gpm-mouse-support
#endif
-remove_jed_library_path
fix-multi-key
slang2
-fix-documentation
-fix-update-before-key-hook
-extend-jed_faq
-fix-help.sl
-extend-help.sl
-fix-jed-doc-file
-fix-pymode-tab-space
-pymode-repeat-shift /* depends on fix-pymode-tab-space */
-add-describe-bindings-to-C-h
-highlight-isearch-results
-sane-color-object-return
diff --git a/debian/patches/add-describe-bindings-to-C-h.dpatch b/debian/patches/add-describe-bindings-to-C-h.dpatch
deleted file mode 100755
index 3a6eac0..0000000
--- a/debian/patches/add-describe-bindings-to-C-h.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_add-describe-bindings-to-C-h.dpatch by <rafael at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from jed 0.99.18-9 diff.gz
-
- at DPATCH@
-
---- jed-0.99.18.orig/lib/site.sl
-+++ jed-0.99.18/lib/site.sl
-@@ -2289,6 +2289,7 @@
- switch (c)
- { case 8 or case 'H': help (); }
- { case 'A' : apropos (); }
-+ { case 'B' : describe_bindings (); }
- { case 'I' : info_mode (); }
- { case '?' : call ("select_menubar");}
- { case 'F' : describe_function ();}
diff --git a/debian/patches/extend-help.sl.dpatch b/debian/patches/extend-help.sl.dpatch
deleted file mode 100755
index afb275c..0000000
--- a/debian/patches/extend-help.sl.dpatch
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## extend-help.sl.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: * Improves expand_keystring() to return Alt- instead of ESC, if ALT_CHAR
-## DP: is non-zero, and print Space instead of the space character
-## DP: * Improves describe_bindings() to convert the key sequences with
-## DP: expand_keystring().
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/help.sl 0.99.19/lib/help.sl
---- 0.99.19~/lib/help.sl 2007-07-02 12:18:37.838960753 +0200
-+++ 0.99.19/lib/help.sl 2007-07-02 12:28:03.646960753 +0200
-@@ -61,6 +61,15 @@
- private variable Key_Name_Table = make_key_name_table ();
- private define make_key_name_table (); % nolonger needed
-
-+% a definition for a lonely Alt character cause problems, because no
-+% Alt-XY where recognized
-+if (ALT_CHAR != 0)
-+ assoc_delete_key(Key_Name_Table, convert_keystring( char(ALT_CHAR) ));
-+
-+% the definition of Key_Space is missing, but it is useful
-+!if ( assoc_key_exists(Key_Name_Table, " ") )
-+ Key_Name_Table[" "] = "Space";
-+
- private define keyeqs (seq, key)
- {
- variable n = strbytelen (key);
-@@ -108,6 +117,7 @@
- break;
- }
- }
-+ variable append_space = 1;
- if (dn == 0)
- {
- if ((seq[0] == '^') and (n > 1))
-@@ -116,7 +126,15 @@
- switch (ch)
- { case 'I': "TAB";}
- { case 'M': "RET";}
-- { case '[': "ESC";}
-+ { case '[':
-+ if (ALT_CHAR != 0 and seq[2] != '\0')
-+ {
-+ append_space = 0;
-+ "Alt-";
-+ }
-+ else
-+ "ESC";
-+ }
- {
- % default
- "Ctrl-" + char (seq[1]);
-@@ -130,11 +148,13 @@
- dn = strbytelen (key_name);
- }
- }
-- expanded_key = strcat (expanded_key, " ", key_name);
-+ expanded_key = strcat (expanded_key, key_name);
-+ if (append_space)
-+ expanded_key = strcat (expanded_key, " ");
- seq = substrbytes (seq, dn+1, -1);
- }
- if (strlen (expanded_key))
-- return substr (expanded_key, 2, -1);
-+ return substr (expanded_key, 1, strlen(expanded_key) - 1);
- return expanded_key;
- }
-
-@@ -461,27 +481,36 @@
- }
-
- bob();
-- replace ("ESC [ A", "UP");
-- replace ("ESC [ a", "SHIFT + UP");
-- replace ("ESC [ B", "DOWN");
-- replace ("ESC [ b", "SHIFT + DOWN");
-- replace ("ESC [ C", "RIGHT");
-- replace ("ESC [ C", "SHIFT + RIGHT");
-- replace ("ESC [ D", "LEFT");
-- replace ("ESC [ d", "SHIFT + LEFT");
-- replace ("ESC O P", "GOLD");
--
-- while (fsearch ("\t\t\t"))
-+ do
- {
-- if (what_column () > TAB)
-+ push_mark();
-+ !if ( ffind("\t\t\t") )
- {
-- if ( what_column() <= TAB*3 )
-- deln( (what_column()-1)/TAB );
-+ pop_mark(0);
-+ continue;
-+ }
-+
-+ key = bufsubstr();
-+ variable old_len = strlen(key);
-+ (key,) = strreplace(key, "ESC", "\e", strlen(key));
-+ key = str_delete_chars(key, " ");
-+ (key,) = strreplace(key, "SPACE", " ", strlen(key));
-+ (key,) = strreplace(key, "DEL", "\x7F", strlen(key));
-+ (key,) = strreplace(key, "TAB", "\t", strlen(key));
-+ bol();
-+ () = replace_chars(old_len, expand_keystring(key));
-+
-+ if (what_column () <= TAB)
-+ insert_char('\t');
-+ else
-+ {
-+ if ( what_column() <= TAB*4 )
-+ deln( (what_column()-1)/TAB - 1 );
- else
- deln(3);
- }
-- eol ();
- }
-+ while ( down(1) );
-
- bob();
-
diff --git a/debian/patches/extend-jed_faq.dpatch b/debian/patches/extend-jed_faq.dpatch
deleted file mode 100755
index ddfdb95..0000000
--- a/debian/patches/extend-jed_faq.dpatch
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## extend-jed_faq.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: A few more questions and answers about Jed.
-
- at DPATCH@
-diff -urNad 0.99.19~/doc/txt/jed_faq.txt 0.99.19/doc/txt/jed_faq.txt
---- 0.99.19~/doc/txt/jed_faq.txt 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/doc/txt/jed_faq.txt 2007-06-19 18:26:56.894136829 +0200
-@@ -20,6 +20,14 @@
- 12. How can I use edt.sl with jed386.exe?
- 13. The TAB key is broken--- it does not insert TABs!
- 14. How do I set custom tab stops in jed?
-+15. When I paste text into Jed, it misaligns everything. How can I prevent
-+ this?
-+16. Why is copy/paste not working on the console?
-+17. Jed makes a difference between a single '/' and multiple '/' in pathnames!
-+ Why?
-+18. Why is jed linked against libncurses when it uses slang?
-+19. When running Jed in an xterm, alt is not sending meta. So, how to make
-+ alt-f skips word forwards?
-
- ----------------------------------------------------------------------------
- Answers:
-@@ -362,7 +370,53 @@
-
- etc...
-
--<14>
-+<15> When I paste text into Jed, it misaligns everything (i.e. every
-+ succeeding line is indented more than the previous, yielding horizontally
-+ cascading text). How can I prevent this?
-+
-+ The reason, why this happens is:
-+ In Jed, carriage return is bound to `newline_and_indent'. While this
-+ auto-indention is a great help in normal editing, it stands in the way when
-+ text is pasted via the mouse. Unfortunately, Jed cannot tell whether its
-+ input comes from a keyboard, another program, or the mouse (XJed can).
-+
-+ There is more than one answer how you can prevent it:
-+ 1: Use xjed.
-+ 2: Use the `paste' function
-+ 1. M-x paste (or bind "paste" to a key)
-+ 2. Now paste your text...
-+ 3: Temporarily change the keybinding by doing:
-+ 1. M-X local_setkey("newline","^M") (Alt-Shift-X: the S-Lang prompt)
-+ 3. Now paste your text...
-+ 4. M-X local setkey("newline_and_indent","^M")
-+
-+<16> Why is copy/paste not working on the console?
-+
-+ First, be sure that the gpm package is installed and correctly
-+ configured. Copying and pasting in a JED window on the console should
-+ then work like in X-Window (with a three button mouse, for instance,
-+ select with left button and paste with middle button). However, for
-+ inserting text selected outside the JED window, you should press down
-+ the Alt key when pasting with the mouse.
-+
-+<17> Jed makes a difference between a single '/' and multiple '/'
-+ in pathnames - e.g. '/usr//bin/' is *not* equal to '/usr/bin/'! Why?
-+
-+ This is like Emacs behaves, too.
-+
-+<18> Why is jed linked against libncurses when it uses slang?
-+
-+ Because it has GPM mouse support and these libraries need ncurses.
-+
-+<19> When running Jed in an xterm, alt is not sending meta (and meta is not
-+ sending escape) so that alt-f and alt-b e.g. don't skip words forwards and
-+ backwards respectively.
-+
-+ According to Thomas Dickey (do a google search to see that there is NO
-+ arguing here :) this is normal for xterm. To have alt "work", add
-+ 'xterm*metaSendsEscape: true' to your .Xresources (or equivalent) and
-+ make sure 'xmodmap -e "keysym Alt_L = Meta_L Alt_L"' is executed
-+ somewhere at X-startup (modify e.g. ~/.Xmodmap).
-
- -------------------------------------------------------------------------------
- This is a useful function used to maintain numbers in this faq.
-@@ -390,4 +444,3 @@
- ++n;
- }
- }
--
diff --git a/debian/patches/extend-manpage.dpatch b/debian/patches/extend-manpage.dpatch
deleted file mode 100644
index e1686af..0000000
--- a/debian/patches/extend-manpage.dpatch
+++ /dev/null
@@ -1,130 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## extend-manpage.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: This patch improves the manpage of jed.
-
- at DPATCH@
-diff -urNad 0.99.19~/doc/manual/jed.1 0.99.19/doc/manual/jed.1
---- 0.99.19~/doc/manual/jed.1 2006-05-06 06:22:30.000000000 +0200
-+++ 0.99.19/doc/manual/jed.1 2007-05-29 02:01:51.484466265 +0200
-@@ -7,7 +7,21 @@
- .SH NAME
- Jed \- programmers editor
- .SH SYNOPSIS
--.B jed [options]
-+.B jed \-\-version
-+.br
-+.B jed\-script \-\-version
-+.br
-+.B xjed \-\-version
-+.sp
-+.B jed [\-\-secure] [\-\-batch|\-\-script|\-\-help] [options]
-+.I file
-+.B ...
-+.br
-+.B jed\-script [\-\-secure]
-+.I script file
-+.B [script options] ...
-+.br
-+.B xjed [\-\-secure] [X options] [\-\-batch|\-\-script|\-\-help] [options]
- .I file
- .B ...
- .SH DESCRIPTION
-@@ -29,12 +43,39 @@
- For complete documentation, see GNU info files, this manual only
- provides brief tutorial.
- .SH OPTIONS
-+.SS major options
- .LP
--.I \-batch
-+.I \-\-version
-+.RS
-+prints the version and compiletime variables.
-+.RE
-+.I \-\-help
-+.RS
-+prints usage information.
-+.RE
-+.I \-\-secure
-+.RS
-+runs Jed in secure mode, e.g. you can't run any external commands with
-+.I system()
-+or
-+.I run_shell_cmd().
-+.RE
-+.I \-\-batch
- .RS
- run Jed in batch mode.
- This is a non-interactive mode.
- .RE
-+.I \-\-script
-+.RS
-+this is a mode like
-+.I \-\-batch
-+but jed does not eval the startup files. It behaves like
-+.I slsh.
-+You must give the file that should be evaluated as second argument. It's
-+the same as calling
-+.B jed\-script.
-+.SS minor options
-+.LP
- .I \-n
- .RS
- do not load
-@@ -81,13 +122,55 @@
- into current buffer.
- .RE
- .LP
-+.SS X options
-+.B xjed
-+accapts the common options like
-+.I \-display, \-name, \-fn and \-geometry.
-+Additionaly it accepts
-+.LP
-+.I \-facesize SIZE, \-fs SIZE
-+.RS
-+if build with XRENDERFONT support, selects the font size
-+.I SIZE.
-+Use it with the option
-+.I \-fn
-+to select a scalable font.
-+.RE
-+.I \-foreground COLOR, \-fg COLOR
-+.RS
-+sets the foreground color.
-+.RE
-+.I \-background COLOR, \-bg COLOR
-+.RS
-+sets the background color.
-+.RE
-+.I \-fgMouse COLOR, \-mfg COLOR
-+.RS
-+sets the foreground color of the mouse pointer.
-+.RE
-+.I \-bgMouse COLOR, \-mbg COLOR
-+.RS
-+sets the background color of the mouse pointer.
-+.RE
-+.I \-Iconic, \-ic
-+.RS
-+start iconified.
-+.RE
-+.I \-title NAME
-+.RS
-+sets the window title to
-+.I NAME.
-+.RE
-+.LP
-+For more options look into
-+.B xterm.c.
- .SH CONFIGURATION
- .RS
- .I Emulating Other Editors
- .RE
- .LP
- JED's ability to create new functions using the
--.I S\--Lang
-+.I S\-Lang
- programming language as well as allowing the user to choose key bindings,
- makes the emulation of other editors possible. Currently, JED provides
- reasonable emulation of the
diff --git a/debian/patches/fix-documentation.dpatch b/debian/patches/fix-documentation.dpatch
deleted file mode 100755
index cab1fe5..0000000
--- a/debian/patches/fix-documentation.dpatch
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-documentation.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: Updates/improvements of the documentation.
-
- at DPATCH@
-diff -urNad 0.99.19~/doc/hlp/jedfuns.hlp 0.99.19/doc/hlp/jedfuns.hlp
---- 0.99.19~/doc/hlp/jedfuns.hlp 2007-05-29 04:40:18.000000000 +0200
-+++ 0.99.19/doc/hlp/jedfuns.hlp 2007-06-09 23:07:19.837893086 +0200
-@@ -3775,9 +3775,11 @@
-
- reads a string from the user and then searches forward for it and if
- not found, it resumes the search from the beginning of the buffer.
-- Note: If the user aborts the function `mini_read' by pressing the
-+
-+ NOTES
-+ If the user aborts the function `read_mini' by pressing the
- keyboard quit character (e.g., Ctrl-G), an error is signaled. This
-- error can be caught by an `ERROR_BLOCK' and the appropriate action
-+ error can be caught by a `try-catch' statement and the appropriate action
- taken. Also if the mini-buffer is already in use, this function should
- not be called. The variable `MINIBUFFER_ACTIVE' may be checked to
- determine if this is the case or not.
-diff -urNad 0.99.19~/doc/tm/rtl/mini.tm 0.99.19/doc/tm/rtl/mini.tm
---- 0.99.19~/doc/tm/rtl/mini.tm 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/doc/tm/rtl/mini.tm 2007-06-09 23:07:39.141893086 +0200
-@@ -101,9 +101,11 @@
- #v-
- reads a string from the user and then searches forward for it and if
- not found, it resumes the search from the beginning of the buffer.
-- Note: If the user aborts the function \var{mini_read} by pressing the
-+
-+\notes
-+ If the user aborts the function \var{read_mini} by pressing the
- keyboard quit character (e.g., Ctrl-G), an error is signaled. This
-- error can be caught by an \var{ERROR_BLOCK} and the appropriate action
-+ error can be caught by a \var{try-catch} statement and the appropriate action
- taken. Also if the mini-buffer is already in use, this function should
- not be called. The variable \var{MINIBUFFER_ACTIVE} may be checked to
- determine if this is the case or not.
diff --git a/debian/patches/fix-help.sl.dpatch b/debian/patches/fix-help.sl.dpatch
deleted file mode 100755
index e82d9c1..0000000
--- a/debian/patches/fix-help.sl.dpatch
+++ /dev/null
@@ -1,126 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-help.sl.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: * describe_bindings() doesn't take care of CASE_SEARCH with leads to the
-## DP: problem that "ESC [ A" and "ESC [ a" is replace by the same key
-## DP: * describe_bindings() gets confused by newlines in the key definiton,
-## DP: like in setkey(" \n", Key_KP_Enter)
-## DP: * describe_bindings(): A key definition that starts with @, SPACE or . must
-## DP: must be treated specialy
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/help.sl 0.99.19/lib/help.sl
---- 0.99.19~/lib/help.sl 2007-01-23 08:07:54.000000000 +0100
-+++ 0.99.19/lib/help.sl 2007-07-02 12:14:26.950960753 +0200
-@@ -372,13 +372,14 @@
- flush("Building bindings..");
- variable map = what_keymap ();
- variable buf = whatbuf ();
-- variable cse = CASE_SEARCH; CASE_SEARCH = 1;
- pop2buf("*KeyBindings*");
-+ variable cse = CASE_SEARCH; CASE_SEARCH = 1;
- erase_buffer ();
- dump_bindings (map);
-
- if (map != "global")
- {
-+ variable dump_end_mark = create_user_mark();
- insert("\nInherited from the global keymap:\n");
- push_spot();
- dump_bindings("global");
-@@ -392,8 +393,12 @@
- variable key = bufsubstr();
- go_right (3);
- push_mark();
-- eol();
-+ !if ( fsearch("\t\t\t") )
-+ eob();
-+ go_up_1();
-+ () = dupmark();
- global_map[key] = bufsubstr();
-+ del_region();
- delete_line();
- }
-
-@@ -407,32 +412,63 @@
- break;
-
- variable global_map_key = global_map[key];
-+ go_right (3);
- if (global_map_key != "")
- {
-- go_right (3);
- push_mark();
-- eol();
-+ () = fsearch("\t\t\t");
-+ if (create_user_mark() > dump_end_mark)
-+ goto_user_mark(dump_end_mark);
-+ go_up_1();
-+ () = dupmark();
- if (bufsubstr() == global_map_key)
- {
-+ del_region();
- delete_line();
- push_spot();
- eob();
-+ (global_map_key,) = strreplace(global_map_key, "\n", "\\n",
-+ strlen(global_map_key));
- vinsert ("%s\t\t\t%s\n", key, global_map_key);
- pop_spot();
- }
- else
-- go_down_1 ();
-+ {
-+ pop_mark(0);
-+ go_down_1 ();
-+ }
- }
- else
-- go_down_1 ();
-+ {
-+ () = fsearch("\t\t\t");
-+ bol();
-+ }
- }
- }
-+ else
-+ {
-+ bob();
-+ while ( not eobp() )
-+ {
-+ !if ( ffind("\t\t\t") )
-+ {
-+ go_up_1();
-+ insert("\\n");
-+ del();
-+ }
-+ go_down_1();
-+ }
-+ }
-
- bob();
- replace ("ESC [ A", "UP");
-+ replace ("ESC [ a", "SHIFT + UP");
- replace ("ESC [ B", "DOWN");
-+ replace ("ESC [ b", "SHIFT + DOWN");
- replace ("ESC [ C", "RIGHT");
-+ replace ("ESC [ C", "SHIFT + RIGHT");
- replace ("ESC [ D", "LEFT");
-+ replace ("ESC [ d", "SHIFT + LEFT");
- replace ("ESC O P", "GOLD");
-
- while (fsearch ("\t\t\t"))
-@@ -466,6 +502,13 @@
- while (fsearch ("\t\t\t"))
- {
- go_right (3);
-+ if ( looking_at_char('@') or looking_at_char(' ') )
-+ continue;
-+ if ( looking_at_char('.') )
-+ {
-+ eol();
-+ bskip_chars("a-zA-Z_");
-+ }
- push_mark();
- !if ( ffind_char('(') )
- eol();
diff --git a/debian/patches/fix-jed-doc-file.dpatch b/debian/patches/fix-jed-doc-file.dpatch
deleted file mode 100755
index 9e4a25b..0000000
--- a/debian/patches/fix-jed-doc-file.dpatch
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-jed-doc-file.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: On the highway to SLang, we should replace Jed_Doc_Files by the SLang
-## DP: internal function [gs]et_doc_files. This patch puts code into
-## DP: jed_(append|insert)_doc_file() to update set_doc_files() obversely.
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/site.sl 0.99.19/lib/site.sl
---- 0.99.19~/lib/site.sl 2007-10-04 22:55:31.799548415 +0200
-+++ 0.99.19/lib/site.sl 2007-10-04 22:55:50.995548415 +0200
-@@ -86,7 +86,6 @@
- %!%-
- variable Info_Directory;
- variable Jed_Bin_Dir;
--variable Jed_Doc_Files;
-
- %!%+
- %\variable{Jed_Highlight_Cache_Path}
-@@ -587,11 +586,21 @@
-
- define jed_append_doc_file (file)
- {
-- Jed_Doc_Files = strcat (Jed_Doc_Files, ",", file);
-+ if ( strlen(Jed_Doc_Files) )
-+ Jed_Doc_Files += ",";
-+ Jed_Doc_Files += file;
-+
-+ variable cur_files = get_doc_files();
-+ set_doc_files( [cur_files[ where(cur_files != file) ], file] );
- }
- define jed_insert_doc_file (file)
- {
-- Jed_Doc_Files = strcat (file, ",", Jed_Doc_Files);
-+ if ( strlen(Jed_Doc_Files) )
-+ Jed_Doc_Files = "," + Jed_Doc_Files;
-+ Jed_Doc_Files = strcat (file, Jed_Doc_Files);
-+
-+ variable cur_files = get_doc_files();
-+ set_doc_files( [file, cur_files[ where(cur_files != file) ]] );
- }
-
- foreach (["jedfuns.hlp", "libfuns.hlp"])
-@@ -600,11 +609,7 @@
- #ifdef VMS
- $2 = "[doc.hlp]" + $2;
- #endif
-- $2 = dircat ($1, $2);
--
-- if (strlen (Jed_Doc_Files))
-- Jed_Doc_Files += ",";
-- Jed_Doc_Files += $2;
-+ jed_append_doc_file( dircat($1, $2) );
- }
-
- #ifexists _slang_doc_dir
diff --git a/debian/patches/fix-pymode-tab-space.dpatch b/debian/patches/fix-pymode-tab-space.dpatch
deleted file mode 100644
index 1193a01..0000000
--- a/debian/patches/fix-pymode-tab-space.dpatch
+++ /dev/null
@@ -1,160 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-pymode-tab-space.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: In Python, it is forbidden to mix up tabs and spaces as indention
-## DP: characters. This patch enhances the python mode to take care of the
-## DP: prefered indention character in a file. Fixes #305668
-##
-## The idea of the patch is to assume the user wants tabs as indent characters,
-## if he set the Py_Indent_Level to the value of TAB. (used for empty files)
-## This might be overwritten by the indention character used in the current
-## file. If the first line that starts with whitespace and is not part of """
-## ... """ or starts with # it overwrites the default selection. If this line
-## starts with a tab, tab is used as character for indention, otherwise spaces
-## are used.
-
- at DPATCH@
-diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
---- trunk~/lib/pymode.sl (Revision 35)
-+++ trunk/lib/pymode.sl (Arbeitskopie)
-@@ -69,6 +69,14 @@
-
-
-
-+private define py_whitespace(cnt)
-+{
-+ if ( get_blocal_var("py_use_tab") )
-+ whitespace(cnt);
-+ else
-+ loop (cnt) insert_char(' ');
-+}
-+
- % Set the following to your favourite indentation level
- custom_variable("Py_Indent_Level", 4);
-
-@@ -139,10 +147,16 @@
-
- col = what_column() - 1;
-
-+ variable indent;
-+ if ( get_blocal_var("py_use_tab") )
-+ indent = TAB;
-+ else
-+ indent = Py_Indent_Level;
-+
- if (py_line_ends_with_colon())
-- col += Py_Indent_Level;
-+ col += indent;
- if (py_endblock_cmd() or (subblock and not py_line_starts_block()))
-- col -= Py_Indent_Level;
-+ col -= indent;
- }
-
- define py_indent_line()
-@@ -151,7 +165,7 @@
-
- col = py_indent_calculate();
- bol_trim ();
-- whitespace( col );
-+ py_whitespace( col );
- }
-
- define py_comment_line()
-@@ -246,11 +260,19 @@
- bskip_white();
- if (bolp() and (col > 1)) {
- pop_spot();
-+ if ( blooking_at("\t") )
-+ {
-+ () = left(1);
-+ del();
-+ }
-+ else
-+ {
- bol_trim ();
- col--;
- if (col mod Py_Indent_Level == 0)
- col--;
-- whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
-+ py_whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
-+ }
- }
- else {
- pop_spot();
-@@ -261,7 +283,7 @@
- define py_shift_line_right()
- {
- bol_skip_white();
-- whitespace(Py_Indent_Level);
-+ py_whitespace(Py_Indent_Level);
- }
-
- define py_shift_region_right()
-@@ -293,9 +315,17 @@
- {
- bol_skip_white();
- if (what_column() > Py_Indent_Level) {
-+ if ( get_blocal_var("py_use_tab") )
-+ {
-+ () = left(1);
-+ del();
-+ }
-+ else
-+ {
- push_mark();
- goto_column(what_column() - Py_Indent_Level);
- del_region();
-+ }
- }
- }
-
-@@ -440,12 +470,12 @@
- % Indent is wrong. Hopefully it's a continuation line.
- level = oldlevel; % reset level
- bol_trim();
-- whitespace(level * Py_Indent_Level + (col - current_indent));
-+ py_whitespace(level * Py_Indent_Level + (col - current_indent));
- } else {
- current_indent = col;
- indent_level[level] = col;
- bol_trim();
-- whitespace(level * Py_Indent_Level);
-+ py_whitespace(level * Py_Indent_Level);
- }
- } while (down(1) == 1);
- }
-@@ -578,12 +608,28 @@
- {
- variable python = "python";
-
-- % TAB is checked by whitespace(). If TAB=0 no tab character is used,
-- % which avoids mixing up whitespace and tab indention
-- if (Py_Indent_Level == 8)
-- TAB = 8;
-- else
-- TAB = 0;
-+ create_blocal_var("py_use_tab");
-+ set_blocal_var(Py_Indent_Level == TAB, "py_use_tab");
-+ push_spot();
-+ bob();
-+ do
-+ {
-+ skip_white();
-+ if ( looking_at("\"\"\"") )
-+ {
-+ () = right(1);
-+ () = fsearch("\"\"\"");
-+ }
-+ else
-+ !if (looking_at_char('#') or eolp() or what_column() == 1)
-+ {
-+ bol();
-+ set_blocal_var(looking_at_char('\t'), "py_use_tab");
-+ break;
-+ }
-+ }
-+ while ( down(1) );
-+ pop_spot();
-
- set_mode (python, 0x4); % flag value of 4 is generic language mode
- use_keymap(python);
diff --git a/debian/patches/fix-update-before-key-hook.dpatch b/debian/patches/fix-update-before-key-hook.dpatch
deleted file mode 100755
index 839774d..0000000
--- a/debian/patches/fix-update-before-key-hook.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-update-before-key-hook.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: The LASTKEY variable is not updated before the _jed_before_key_hooks
-## DP: hooks are called, so they see a wrong key sequencs.
-
- at DPATCH@
-diff -urNad 0.99.19~/src/keymap.c 0.99.19/src/keymap.c
---- 0.99.19~/src/keymap.c 2006-05-19 18:27:31.000000000 +0200
-+++ 0.99.19/src/keymap.c 2007-06-11 14:02:13.399552303 +0200
-@@ -594,11 +594,15 @@
-
- #if JED_HAS_TTY_MENUS
- if (Jed_Menus_Active)
-- key = jed_menu_do_key ();
-+ {
-+ key = jed_menu_do_key ();
-+ update_jed_keybuffer ();
-+ }
- else
- #endif
- {
- key = SLang_do_key (CBuf->keymap, jed_getkey);
-+ update_jed_keybuffer ();
- if ((IS_MINIBUFFER == 0)
- && (key != NULL)
- && jed_hook_exists ("_jed_before_key_hooks"))
-@@ -608,8 +612,6 @@
- }
- }
-
-- update_jed_keybuffer ();
--
- if ((key != NULL) && (key->f.f != NULL))
- {
- if (Repeat_Factor == NULL) return key_interpret (key);
diff --git a/debian/patches/highlight-isearch-results.dpatch b/debian/patches/highlight-isearch-results.dpatch
deleted file mode 100644
index 120d503..0000000
--- a/debian/patches/highlight-isearch-results.dpatch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## highlight-isearch-results.dpatch by G. Milde <g.milde at web.de>
-##
-## DP: Highlight the results of incremental search
-
- at DPATCH@
-
---- jed-0.99.18.orig/lib/isearch.sl
-+++ jed-0.99.18/lib/isearch.sl
-@@ -21,9 +21,10 @@
- %%
- %% You may use the following variables to change this behaviour,
- %% either here or (better!) in your keybinding defining file (e.g. ".jedrc")
--%%
--%% This code fragment checks to see what the isearch keys are bound to
-
-+require ("srchmisc");
-+
-+%% This code fragment checks to see what the isearch keys are bound to
- private define get_bound_key (search_func, default)
- {
- foreach (["", which_key (search_func), pop()])
-@@ -168,21 +169,25 @@
- prompt = prompt_prefix + "search backward" + prompt_suffix;
-
- message (prompt + str);
--
- push_spot ();
-- if ((dir > 0) and looking_at (str))
-- go_right (strlen (str));
-- update_sans_update_hook (0);
-- pop_spot ();
-
- IGNORE_USER_ABORT++;
--#ifeval _slang_version >= 20000
-+
-+ if (looking_at (str) and (Last_Search_Failed == 0))
-+ mark_next_nchars (strlen(str), dir);
-+ %if ((dir > 0) and looking_at (str))
-+ % go_right (strlen (str));
-+
-+ update_sans_update_hook (0);
-+ pop_spot ();
-+
-+#ifexists AnyError
- try
- {
- #endif
- c = getkey();
- }
--#ifeval _slang_version >= 20000
-+#ifexists AnyError
- finally
- #endif
- IGNORE_USER_ABORT--;
diff --git a/debian/patches/pymode-repeat-shift.dpatch b/debian/patches/pymode-repeat-shift.dpatch
deleted file mode 100644
index 3598f28..0000000
--- a/debian/patches/pymode-repeat-shift.dpatch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pymode-repeat-shift.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: There was a suggestion on the Jed mailing list to make the region shift
-## DP: command respects the repeat count (the prefix argument).
-## DP: This patch depends on the fix-pymode-tab-space patch.
-
- at DPATCH@
-diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
---- trunk~/lib/pymode.sl 2006-09-19 13:38:27.201564732 +0200
-+++ trunk/lib/pymode.sl 2006-09-19 13:39:22.477564732 +0200
-@@ -279,18 +279,21 @@
-
- define py_shift_line_right()
- {
-+ variable times = prefix_argument(1);
- bol_skip_white();
-- py_whitespace(Py_Indent_Level);
-+ py_whitespace(times * Py_Indent_Level);
- }
-
- define py_shift_region_right()
- {
-+ variable times = prefix_argument(1);
- variable n;
- check_region (1); % spot_pushed, now at end of region
- n = what_line ();
- pop_mark_1 ();
- loop (n - what_line ())
- {
-+ set_prefix_argument(times);
- py_shift_line_right();
- go_down_1 ();
- }
-@@ -310,17 +313,18 @@
-
- define py_shift_line_left()
- {
-+ variable times = prefix_argument(1);
- bol_skip_white();
-- if (what_column() > Py_Indent_Level) {
-+ if (what_column() > times * Py_Indent_Level) {
- if ( get_blocal_var("py_use_tab") )
- {
-- () = left(1);
-- del();
-+ () = left(times);
-+ deln(times);
- }
- else
- {
- push_mark();
-- goto_column(what_column() - Py_Indent_Level);
-+ goto_column(what_column() - times * Py_Indent_Level);
- del_region();
- }
- }
-@@ -328,6 +332,7 @@
-
- define py_shift_region_left()
- {
-+ variable times = prefix_argument(1);
- variable n;
-
- check_region (1);
-@@ -335,6 +340,7 @@
- pop_mark_1 ();
- loop (n - what_line ())
- {
-+ set_prefix_argument(times);
- py_shift_line_left();
- go_down_1 ();
- }
diff --git a/debian/patches/remove_jed_library_path.dpatch b/debian/patches/remove_jed_library_path.dpatch
deleted file mode 100755
index 3c6c2e2..0000000
--- a/debian/patches/remove_jed_library_path.dpatch
+++ /dev/null
@@ -1,209 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_jed_library_path.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: In version 0.99.19-82 the require and provides functions where dropped
-## DP: from jed and the functions from slsh stepped in. They have a different
-## DP: argument list than the old jed functions and they do not care about jed
-## DP: library path. So it's time to kick the jed library path and replace it
-## DP: slang load path.
-## DP: This patch includes two SLang function [gs]et_jed_library_path() as
-## DP: wrapper around [gs]et_slang_load_path() to ease migratition.
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/os.sl 0.99.19/lib/os.sl
---- 0.99.19~/lib/os.sl 2006-11-10 21:33:59.000000000 +0100
-+++ 0.99.19/lib/os.sl 2007-06-07 12:42:34.034482624 +0200
-@@ -14,7 +14,7 @@
- autoload ("_win32_get_helper_app_name", "runpgm");
- # ifexists set_import_module_path
- $1 = path_concat (JED_ROOT, "slsh");
--set_jed_library_path (strcat (get_jed_library_path (), ",", $1));
-+set_slang_load_path (strcat (get_slang_load_path (), char(path_get_delimiter()), $1));
- % set the library path for modules.
- set_import_module_path(path_concat($1, "modules"));
- # endif
-diff -urNad 0.99.19~/lib/site.sl 0.99.19/lib/site.sl
---- 0.99.19~/lib/site.sl 2007-05-29 04:40:18.000000000 +0200
-+++ 0.99.19/lib/site.sl 2007-06-07 12:47:34.880968624 +0200
-@@ -44,6 +44,21 @@
- public variable _Jed_Color_Scheme = NULL;
- public variable _Jed_Default_Color_Scheme = "black3";
-
-+% These are function to archive backward compatibiliy and give third
-+% party mode time to migrate to slang load path.
-+public define get_jed_library_path()
-+{
-+ variable t = get_slang_load_path();
-+ () = strreplace(t, char(path_get_delimiter()), ",", strlen(t));
-+ return ();
-+}
-+
-+public define set_jed_library_path(path)
-+{
-+ () = strreplace(path, ",", char(path_get_delimiter()), strlen(path));
-+ set_slang_load_path( () );
-+}
-+
- %!%+
- %\variable{Tab_Always_Inserts_Tab}
- %\synopsis{Configure the tab key}
-@@ -482,7 +497,7 @@
- %!%-
- define search_path_for_file ()
- {
-- variable path, f, delim = ',';
-+ variable path, f, delim = path_get_delimiter();
- if (_NARGS == 3)
- delim = ();
- (path, f) = ();
-@@ -511,7 +526,7 @@
- %!%-
- define expand_jedlib_file (f)
- {
-- f = search_path_for_file (get_jed_library_path (), f);
-+ f = search_path_for_file (get_slang_load_path (), f);
- if (f == NULL)
- return "";
- f;
-@@ -569,8 +584,8 @@
- Jed_Bin_Dir = dircat (JED_ROOT, "bin");
- #endif
-
--Jed_Highlight_Cache_Path = get_jed_library_path ();
--Jed_Highlight_Cache_Dir = extract_element (Jed_Highlight_Cache_Path, 0, ',');
-+Jed_Highlight_Cache_Path = get_slang_load_path ();
-+Jed_Highlight_Cache_Dir = extract_element (Jed_Highlight_Cache_Path, 0, path_get_delimiter());
-
- variable Jed_Doc_Files = "";
- #ifdef VMS
-@@ -2134,7 +2149,7 @@
-
- % Comma separated list of directories
- public variable Color_Scheme_Path = "";
--foreach (strtok (get_jed_library_path (), ","))
-+foreach (strtok (get_slang_load_path (), char(path_get_delimiter()) ))
- {
- $1 = ();
- Color_Scheme_Path = dircat ($1, "colors");
-@@ -2149,11 +2164,11 @@
- return;
- scheme = string (scheme); % for back-compatability, file may be an integer
-
-- file = search_path_for_file (Color_Scheme_Path, scheme + ".sl");
-+ file = search_path_for_file (Color_Scheme_Path, scheme + ".sl", ',');
- if (file == NULL)
- {
- % Try .slc file
-- file = search_path_for_file (Color_Scheme_Path, scheme + ".slc");
-+ file = search_path_for_file (Color_Scheme_Path, scheme + ".slc", ',');
- if (file == NULL)
- {
- vmessage ("Color scheme %S is not supported", scheme);
-@@ -3270,13 +3285,13 @@
- if (2 != file_status ($2))
- continue;
-
-- set_jed_library_path (strcat (get_jed_library_path (), ",", $2));
-+ set_slang_load_path (strcat (get_slang_load_path (), char(path_get_delimiter()), $2));
- $2 = path_concat ($2, "help");
- if (2 == file_status ($2))
- jed_append_doc_file ($2);
-
- $2 = path_concat ($1, "share/slsh");
-- set_jed_library_path (strcat (get_jed_library_path (), ",", $2));
-+ set_slang_load_path (strcat (get_slang_load_path (), char(path_get_delimiter()), $2));
- $2 = path_concat ($2, "help");
- if (2 == file_status ($2))
- jed_append_doc_file ($2);
-diff -urNad 0.99.19~/src/ledit.c 0.99.19/src/ledit.c
---- 0.99.19~/src/ledit.c 2006-12-09 18:21:24.000000000 +0100
-+++ 0.99.19/src/ledit.c 2007-06-07 12:42:34.042482624 +0200
-@@ -87,8 +87,6 @@
- int Ignore_Beep = 0;
- int MiniBuffer_Active = 0;
-
--char *Jed_Library;
--
- /* Do not change this value without changing file_findfirst/next. */
- #define JED_MAX_COMPLETION_LEN JED_MAX_PATH_LEN
-
-@@ -1379,7 +1377,7 @@
- VFILE *vp = NULL;
-
- libf = file;
-- lib = Jed_Library;
-+ lib = SLpath_get_load_path ();
-
- /* If file begins with ./,then read it from the current directory */
- if ((0 == strncmp (file, "./", 2))
-@@ -1403,7 +1401,8 @@
- type = NULL;
-
- n = 0;
-- while (0 == SLextract_list_element (lib, n, ',', libfsl, sizeof(libfsl)))
-+ while (0 == SLextract_list_element (lib, n, SLpath_get_delimiter(),
-+ libfsl, sizeof(libfsl)))
- {
- n++;
-
-diff -urNad 0.99.19~/src/ledit.h 0.99.19/src/ledit.h
---- 0.99.19~/src/ledit.h 2006-03-04 08:55:05.000000000 +0100
-+++ 0.99.19/src/ledit.h 2007-06-07 12:42:34.042482624 +0200
-@@ -67,7 +67,6 @@
- extern void set_tab(int *);
- extern char *command_line_argv(int *);
- extern int MiniBuffer_Active;
--extern char *Jed_Library;
- extern FILE *jed_open_slang_file(char *, char *);
- extern char *Completion_Buffer;
- extern void set_expansion_hook (char *);
-diff -urNad 0.99.19~/src/main.c 0.99.19/src/main.c
---- 0.99.19~/src/main.c 2006-12-16 17:59:16.000000000 +0100
-+++ 0.99.19/src/main.c 2007-06-07 12:42:34.046482624 +0200
-@@ -191,9 +191,8 @@
- }
- }
- else strcpy(jed_lib, jl);
--
-- Jed_Library = SLang_create_slstring (jed_lib);
-- if (Jed_Library == NULL)
-+
-+ if (SLpath_set_load_path(jed_lib) != 0)
- exit_error ("Out of memory", 0);
- }
-
-diff -urNad 0.99.19~/src/replace.c 0.99.19/src/replace.c
---- 0.99.19~/src/replace.c 2006-08-08 05:34:21.000000000 +0200
-+++ 0.99.19/src/replace.c 2007-06-07 12:42:34.046482624 +0200
-@@ -304,22 +304,6 @@
-
- /*}}}*/
-
--static char *get_jed_library_path (void)
--{
-- return Jed_Library;
--}
--
--static void set_jed_library_path (void)
--{
-- char *s;
--
-- if (SLang_pop_slstring (&s))
-- return;
--
-- SLang_free_slstring (Jed_Library);
-- Jed_Library = s;
--}
--
- static int set_buffer_umask (int *cmask)
- {
- int u = CBuf->umask;
-@@ -393,8 +377,6 @@
- #endif
- MAKE_INTRINSIC("count_narrows", jed_count_narrows, INT_TYPE, 0),
- MAKE_INTRINSIC("widen_buffer", widen_this_buffer, VOID_TYPE, 0),
-- MAKE_INTRINSIC ("get_jed_library_path", get_jed_library_path, STRING_TYPE, 0),
-- MAKE_INTRINSIC ("set_jed_library_path", set_jed_library_path, VOID_TYPE, 0),
- MAKE_INTRINSIC(NULL, NULL, 0, 0)
- };
-
diff --git a/debian/patches/sane-color-object-return.dpatch b/debian/patches/sane-color-object-return.dpatch
deleted file mode 100755
index 512bbae..0000000
--- a/debian/patches/sane-color-object-return.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## sane-color-object-return.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: If no colors have been associated with a color-object, return
-## DP: "default" for the foreground/background colors instead of NULL.
-## DP: (This was taken from the JED SVN repository at gna.org, revision 34,
-## DP: corresponding to JED release 0.99.19-16.)
-
- at DPATCH@
-
---- jed-0.99.18.orig/src/colors.c
-+++ jed-0.99.18/src/colors.c
-@@ -186,8 +186,8 @@
- i = JNORMAL_COLOR;
-
- map = Color_Name_Map + i;
-- (void) SLang_push_string (map->fg);
-- (void) SLang_push_string (map->bg);
-+ (void) SLang_push_string (map->fg == NULL ? "default" : map->fg);
-+ (void) SLang_push_string (map->bg == NULL ? "default" : map->bg);
- }
-
- static void add_color_object_cmd (char *name)
--
Debian packaging of JED
More information about the Pkg-jed-commit
mailing list