[Pkg-jed-commit] [SCM] Debian packaging of JED branch, jo-0.99.19, updated. 1%3A0.99.18+dfsg.1-10-291-ga668a94
Jörg Sommer
joerg at alea.gnuu.de
Sat Nov 21 22:27:23 UTC 2009
The following commit has been merged in the jo-0.99.19 branch:
commit e3dce8aaaedc359ec413b5b29a723370d697d083
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date: Sun Nov 15 23:20:41 2009 +0100
Remove obsolate patches
fix-multi-key -- applied upstream 0.99.19pre205
slang2 -- applied modified upstream 0.99.19pre206
diff --git a/debian/changelog b/debian/changelog
index f779200..658121e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ jed (1:0.99.19~pre210-1) UNRELEASED; urgency=low
https://svn.gna.org/svn/jed/trunk
+ 0.99.19pre207 improved scrolling (Closes: #306223)
+ * Removed obsolate patches:
+ + fix-multi-key -- applied upstream 0.99.19pre205
+ + slang2 -- applied modified upstream 0.99.19pre206
+
-- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
jed (1:0.99.19~pre175-1) experimental; urgency=low
diff --git a/debian/patches/00list b/debian/patches/00list
index 153b1e8..322f487 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,6 +1,3 @@
50_README
50_jed-manpage
config.guess+sub
-
-fix-multi-key
-slang2
diff --git a/debian/patches/fix-multi-key.dpatch b/debian/patches/fix-multi-key.dpatch
deleted file mode 100755
index da60e78..0000000
--- a/debian/patches/fix-multi-key.dpatch
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-multi-key.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: The multi key does not work in Jed.
-
- at DPATCH@
-diff -urNad trunk~/src/xterm.sl trunk/src/xterm.c
---- trunk~/src/xterm.c (Revision 35)
-+++ trunk/src/xterm.c (Arbeitskopie)
-@@ -1490,21 +1490,15 @@
- static int X_input_pending (void) /*{{{*/
- {
- XEvent ev;
-- int n;
--
- if (No_XEvents) return 0;
-
-- n = XPending (This_XDisplay);
-- if (!n) return (0);
--
-- /* I need some way of getting only kbd events. */
-- while (n--)
-- {
-- XPeekEvent(This_XDisplay, &ev);
-- if (0 == x_handle_harmless_events (&ev)) return 1;
-- XNextEvent(This_XDisplay, &ev);
-- }
-- return 0;
-+ if ( XCheckMaskEvent(This_XDisplay, KeyPressMask, &ev) )
-+ {
-+ XPutBackEvent(This_XDisplay, &ev);
-+ return 1;
-+ }
-+ else
-+ return 0;
- }
-
- /*}}}*/
diff --git a/debian/patches/slang2.dpatch b/debian/patches/slang2.dpatch
deleted file mode 100755
index 84e54f5..0000000
--- a/debian/patches/slang2.dpatch
+++ /dev/null
@@ -1,385 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## slang2.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: This patch changes old pre‐slang2 language contructs into slang2
-## DP: contructs, e.g. replace ERROR_BLOCK by try-catch-finally.
-## DP: The intention of this patch is to help the upstream maintainer.
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/acompile.sl 0.99.19/lib/acompile.sl
---- 0.99.19~/lib/acompile.sl 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/acompile.sl 2007-06-17 13:34:08.265297107 +0200
-@@ -85,11 +85,9 @@
- {
- if (bufferp (Compile_Output_Buffer))
- error ("A compile process is already running.");
-- ERROR_BLOCK
-- {
-- _clear_error ();
-- }
-- kill_process (Compile_Process_Id);
-+ try
-+ kill_process (Compile_Process_Id);
-+ catch RunTimeError;
- Compile_Process_Id = -1;
- }
-
-diff -urNad 0.99.19~/lib/binary.sl 0.99.19/lib/binary.sl
---- 0.99.19~/lib/binary.sl 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/binary.sl 2007-06-17 13:16:45.201297107 +0200
-@@ -5,13 +5,13 @@
- variable file, bytes, len, pos;
-
- file = read_file_from_mini ("Find Binary File:");
-- ERROR_BLOCK
-+ set_file_translation (1);
-+ try
- {
-- set_file_translation (0);
-+ () = find_file (file);
- }
-- set_file_translation (1);
-- () = find_file (file);
-- EXECUTE_ERROR_BLOCK;
-+ finally
-+ set_file_translation (0);
- no_mode();
- set_overwrite(1);
- %
-diff -urNad 0.99.19~/lib/bookmark.sl 0.99.19/lib/bookmark.sl
---- 0.99.19~/lib/bookmark.sl 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/bookmark.sl 2007-06-17 13:35:42.753297107 +0200
-@@ -59,13 +59,15 @@
- {
- #ifdef HAS_BLOCAL_VAR
- variable fun;
-- ERROR_BLOCK
-+ try
- {
-- _clear_error ();
-- error ("Mark lies outside visible part of buffer.");
-+ fun = get_blocal_var ("bookmark_narrow_hook");
-+ mrk; eval (fun);
-+ }
-+ catch AnyError:
-+ {
-+ throw UsageError, "Mark lies outside visible part of buffer.";
- }
-- fun = get_blocal_var ("bookmark_narrow_hook");
-- mrk; eval (fun);
- #else
- error ("Mark lies outside visible part of buffer.");
- #endif
-diff -urNad 0.99.19~/lib/ctags.sl 0.99.19/lib/ctags.sl
---- 0.99.19~/lib/ctags.sl 2006-11-10 21:17:52.000000000 +0100
-+++ 0.99.19/lib/ctags.sl 2007-06-17 13:29:04.581297107 +0200
-@@ -59,19 +59,6 @@
- sw2buf (buf);
- }
-
--#ifnexists AnyError
-- variable error_happened = 0;
-- ERROR_BLOCK
-- {
-- _clear_error ();
-- error_happened = 1;
-- }
-- buf = user_mark_buffer (s.mark);
-- if (error_happened == 0)
-- goto_user_mark (s.mark);
-- if (error_happened == 0)
-- return;
--#else
- try
- {
- buf = user_mark_buffer (s.mark);
-@@ -79,7 +66,6 @@
- return;
- }
- catch AnyError;
--#endif
-
- () = read_file (s.file);
- goto_line (s.line);
-diff -urNad 0.99.19~/lib/emul.sl 0.99.19/lib/emul.sl
---- 0.99.19~/lib/emul.sl 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/emul.sl 1970-01-01 01:00:00.000000000 +0100
-@@ -1,10 +0,0 @@
--% These functions allow jed to work with older versions of the slang library
--
--#ifnexists strtrans
--% This emulation is not at all complete. It can only be used with one
--% one character transformations.
--define strtrans (a, b, c)
--{
-- str_replace_all (a, b, c);
--}
--#endif
-diff -urNad 0.99.19~/lib/menu.sl 0.99.19/lib/menu.sl
---- 0.99.19~/lib/menu.sl 2007-01-23 08:07:54.000000000 +0100
-+++ 0.99.19/lib/menu.sl 2007-06-17 13:19:53.069297107 +0200
-@@ -180,16 +180,13 @@
- {
- variable n, key, len, next, nlen;
-
-- ERROR_BLOCK
-+ try
- {
-- set_top_status_line (Global_Top_Status_Line);
-- pop ();
-+ menu_select_cmd ("File,Edit,Buffers,Windows,Help,Misc,Exit",
-+ "menu_files,menu_basics,menu_buffers,menu_window_cmds,menu_help,menu_misc, at exit_jed");
- }
--
-- menu_select_cmd ("File,Edit,Buffers,Windows,Help,Misc,Exit",
-- "menu_files,menu_basics,menu_buffers,menu_window_cmds,menu_help,menu_misc, at exit_jed");
--
-- EXECUTE_ERROR_BLOCK ();
-+ finally
-+ set_top_status_line (Global_Top_Status_Line);
-
- %
- % Show user keybinding of the function.
-diff -urNad 0.99.19~/lib/mouse.sl 0.99.19/lib/mouse.sl
---- 0.99.19~/lib/mouse.sl 2007-01-18 16:20:00.000000000 +0100
-+++ 0.99.19/lib/mouse.sl 2007-06-17 13:27:08.285297107 +0200
-@@ -236,15 +236,15 @@
-
- if (shift == 1)
- {
-- ERROR_BLOCK
-+ try
- {
-- _clear_error ();
-+ if (but == 1)
-+ call ("page_down");
-+ else if (but == 4)
-+ call ("page_up");
- }
-- if (but == 1)
-- call ("page_down");
-- else if (but == 4)
-- call ("page_up");
--
-+ catch AnyError;
-+
- return 0;
- }
-
-diff -urNad 0.99.19~/lib/replace.sl 0.99.19/lib/replace.sl
---- 0.99.19~/lib/replace.sl 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/replace.sl 2007-06-17 13:25:03.117297107 +0200
-@@ -24,8 +24,34 @@
-
- if (-1 != prefix_argument (-1))
- REPLACE_PRESERVE_CASE_INTERNAL = not (REPLACE_PRESERVE_CASE_INTERNAL);
--
-- ERROR_BLOCK
-+
-+ try
-+ {
-+ while (n)
-+ {
-+ buf = (); n--;
-+
-+ % skip special buffers
-+ if ((buf[0] == '*') or (buf[0] == ' ')) continue;
-+
-+ sw2buf (buf);
-+
-+ (file,,,flags) = getbuf_info ();
-+
-+ % skip if no file associated with buffer, or is read only
-+ !if (strlen (file) or (flags & 8)) continue;
-+
-+ % ok, this buffer is what we want.
-+
-+ push_spot_bob ();
-+ try
-+ replace_with_query (&search_search_function, pat, rep, 1,
-+ &replace_do_replace);
-+ finally
-+ pop_spot();
-+ }
-+ }
-+ finally
- {
- sw2buf (cbuf);
- pop_spot ();
-@@ -33,34 +59,6 @@
- REPLACE_PRESERVE_CASE_INTERNAL = 0;
- }
-
-- while (n)
-- {
-- buf = (); n--;
--
-- % skip special buffers
-- if ((buf[0] == '*') or (buf[0] == ' ')) continue;
--
-- sw2buf (buf);
--
-- (file,,,flags) = getbuf_info ();
--
-- % skip if no file associated with buffer, or is read only
-- !if (strlen (file) or (flags & 8)) continue;
--
-- % ok, this buffer is what we want.
--
-- push_spot_bob ();
-- ERROR_BLOCK
-- {
-- pop_spot ();
-- }
--
-- replace_with_query (&search_search_function, pat, rep, 1,
-- &replace_do_replace);
-- pop_spot ();
-- }
--
-- EXECUTE_ERROR_BLOCK;
- message ("Done.");
- }
-
-diff -urNad 0.99.19~/lib/site.sl 0.99.19/lib/site.sl
---- 0.99.19~/lib/site.sl 2007-06-17 12:58:31.781297107 +0200
-+++ 0.99.19/lib/site.sl 2007-06-17 13:13:21.913297107 +0200
-@@ -260,14 +260,8 @@
- %!%-
- define str_replace_all (str, old, new)
- {
--#ifexists strreplace
-- (str,) = strreplace (str, old, new, strlen (str));
-- str;
--#else
-- while (str_replace (str, old, new))
-- str = ();
-- str;
--#endif
-+ () = strreplace (str, old, new, strlen (str));
-+ % leave the new string on the stack
- }
-
- %}}}
-@@ -277,9 +271,6 @@
-
- %{{{ Compatibility functions
-
--if (_slang_version < 10308)
-- () = evalfile ("emul.sl");
--
- #ifnexists strbytelen
- define strbytelen (s)
- {
-@@ -1685,13 +1676,13 @@
- %!%-
- public define redo ()
- {
-- ERROR_BLOCK
-+ try
-+ call("kbd_quit");
-+ catch AnyError:
- {
- call("undo");
-- _clear_error ();
- message ("Undo will now perform the action of redo");
-- };
-- call("kbd_quit");
-+ }
- }
-
- %}}}
-@@ -2408,46 +2399,45 @@
-
- runhooks ("startup_hook");
-
-- ERROR_BLOCK
-- {
-- eval (".()jed_startup_hook");
-- }
--
-- !if (strcmp(whatbuf(), scratch) or buffer_modified())
-+ try
- {
-- ERROR_BLOCK
-- {
-- setbuf (scratch);
-- erase_buffer ();
-- set_buffer_modified_flag (0);
-- }
--
-- () = insert_file (expand_jedlib_file("cpright.hlp"));
-- set_buffer_modified_flag (0);
-- bob();
-- file = Null_String;
-- message (Null_String);
-- if (Startup_With_File > 0)
-- {
-- forever
-+ !if (strcmp(whatbuf(), scratch) or buffer_modified())
-+ {
-+ try
- {
-- file = read_file_from_mini ("Enter Filename:");
-- if (strlen(extract_filename(file))) break;
-+ () = insert_file (expand_jedlib_file("cpright.hlp"));
-+ set_buffer_modified_flag (0);
-+ bob();
-+ file = Null_String;
-+ message (Null_String);
-+ if (Startup_With_File > 0)
-+ {
-+ forever
-+ {
-+ file = read_file_from_mini ("Enter Filename:");
-+ if (strlen(extract_filename(file))) break;
-+ }
-+ }
-+ else !if (Startup_With_File)
-+ {
-+ do
-+ {
-+ update_sans_update_hook (1);
-+ }
-+ while (not (input_pending(600))); % 1 minute
-+ }
- }
-- }
-- else !if (Startup_With_File)
-- {
-- do
-+ finally
- {
-- update_sans_update_hook (1);
-+ setbuf (scratch);
-+ erase_buffer ();
-+ set_buffer_modified_flag (0);
- }
-- while (not (input_pending(600))); % 1 minute
--
-- }
-- EXECUTE_ERROR_BLOCK;
-- if (strlen (file)) () = find_file(file);
-+ if (strlen (file)) () = find_file(file);
-+ }
- }
-- EXECUTE_ERROR_BLOCK;
-+ finally
-+ eval (".()jed_startup_hook");
- }
-
- add_to_hook ("_jed_startup_hooks", &jed_startup_hook);
-@@ -2574,9 +2564,10 @@
- {
- read_with_completion("Insert Buffer:", Null_String, Null_String, 'b');
- push_spot();
-- ERROR_BLOCK {pop_spot();}
-- insbuf(());
-- EXECUTE_ERROR_BLOCK;
-+ try
-+ insbuf(());
-+ finally
-+ pop_spot();
- }
- add_completion("insert_buffer");
-
--
Debian packaging of JED
More information about the Pkg-jed-commit
mailing list