[Pkg-jed-commit] r505 - in jed/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-01-17 20:24:17 +0100 (Wed, 17 Jan 2007)
New Revision: 505

Added:
   jed/trunk/debian/patches/highlight-isearch-results.dpatch
Modified:
   jed/trunk/debian/changelog
   jed/trunk/debian/patches/00list
Log:
* debian/patches/highlight-isearch-results.dpatch: When using
  incremental search, highlight the text found after each find.



Modified: jed/trunk/debian/changelog
===================================================================
--- jed/trunk/debian/changelog	2007-01-17 18:44:53 UTC (rev 504)
+++ jed/trunk/debian/changelog	2007-01-17 19:24:17 UTC (rev 505)
@@ -11,13 +11,17 @@
     (closes: #180577). [GM]
 
   * debian/README.Debian: Added a Q&A entry to the FAQ section explaining
-    that the Alt key should be pressed down when pasting text select
+    that the Alt key should be pressed down when pasting text selected
     outside the console (closes: #174370) [RL]
   * debian/control: related to the above, suggest the gpm package [RL]
 
   * debian/patches/add-describe-bindings-to-C-h.dpatch: Bind "Ch b" to
     describe bindings in Emacs emulation (closes: #292421) [RL]
 
+  * debian/patches/highlight-isearch-results.dpatch: When using
+    incremental search, highlight the text found after each find. Patch
+    contributed by Günther Milde (closes: #387061) [RL]
+
  --
 
 jed (0.99.18-8) unstable; urgency=low

Modified: jed/trunk/debian/patches/00list
===================================================================
--- jed/trunk/debian/patches/00list	2007-01-17 18:44:53 UTC (rev 504)
+++ jed/trunk/debian/patches/00list	2007-01-17 19:24:17 UTC (rev 505)
@@ -18,3 +18,4 @@
 fix-pymode-tab-space
 pymode-repeat-shift  /* depends on fix-pymode-tab-space */
 add-describe-bindings-to-C-h
+highlight-isearch-results

Added: jed/trunk/debian/patches/highlight-isearch-results.dpatch
===================================================================
--- jed/trunk/debian/patches/highlight-isearch-results.dpatch	2007-01-17 18:44:53 UTC (rev 504)
+++ jed/trunk/debian/patches/highlight-isearch-results.dpatch	2007-01-17 19:24:17 UTC (rev 505)
@@ -0,0 +1,55 @@
+#! /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--;