rpms/irssi/devel irssi-support-meta-cursor-xterm.patch, 1.1, 1.2 irssi.spec, 1.23, 1.24

[Marek Mahut (mmahut)]

Author: mmahut

Update of /cvs/pkgs/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20318

Modified Files:
	irssi-support-meta-cursor-xterm.patch irssi.spec 
Log Message:
Fixing the xterm patch


irssi-support-meta-cursor-xterm.patch:

Index: irssi-support-meta-cursor-xterm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi-support-meta-cursor-xterm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- irssi-support-meta-cursor-xterm.patch	16 Aug 2007 20:38:54 -0000	1.1
+++ irssi-support-meta-cursor-xterm.patch	19 Aug 2007 12:52:54 -0000	1.2
@@ -1,12 +1,33 @@
-Special thanks for this patch goes to James Bowes
-
---- src/fe-text/gui-readline.c	2007-08-16 21:51:54.000000000 +0200
-+++ src/fe-text/gui-readline.c	2007-08-16 21:58:53.000000000 +0200
-@@ -1053,6 +1053,7 @@
- 	key_bind("key", NULL, "meta-[", "meta2", (SIGNAL_FUNC) key_combo);
- 	key_bind("key", NULL, "meta-O", "meta2", (SIGNAL_FUNC) key_combo);
- 	key_bind("key", NULL, "meta-[O", "meta2", (SIGNAL_FUNC) key_combo);
-+	key_bind("key", NULL, "[1;3", "meta2", (SIGNAL_FUNC) key_combo);
+--- src/fe-text/gui-readline.c.orig	2007-08-18 23:17:35.633891000 +0200
++++ src/fe-text/gui-readline.c	2007-08-18 23:25:04.000000000 +0200
+@@ -1087,6 +1087,15 @@
+ 	key_bind("key", NULL, "meta2-1;5D", "cleft", (SIGNAL_FUNC) key_combo);
+ 	key_bind("key", NULL, "meta2-1;5C", "cright", (SIGNAL_FUNC) key_combo);
  
-         /* arrow keys */
- 	key_bind("key", NULL, "meta2-A", "up", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta2-1;3A", "mup", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta2-1;3B", "mdown", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta2-1;3D", "mleft", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta2-1;3C", "mright", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta-up", "mup", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta-down", "mdown", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta-left", "mleft", (SIGNAL_FUNC) key_combo);
++	key_bind("key", NULL, "meta-right", "mright", (SIGNAL_FUNC) key_combo);
++
+ 	/* cursor movement */
+ 	key_bind("backward_character", "", "left", NULL, (SIGNAL_FUNC) key_backward_character);
+ 	key_bind("forward_character", "", "right", NULL, (SIGNAL_FUNC) key_forward_character);
+@@ -1132,10 +1141,10 @@
+         /* window managing */
+ 	key_bind("previous_window", "Previous window", "^P", NULL, (SIGNAL_FUNC) key_previous_window);
+ 	key_bind("next_window", "Next window", "^N", NULL, (SIGNAL_FUNC) key_next_window);
+-	key_bind("upper_window", "Upper window", "meta-up", NULL, (SIGNAL_FUNC) key_upper_window);
+-	key_bind("lower_window", "Lower window", "meta-down", NULL, (SIGNAL_FUNC) key_lower_window);
+-	key_bind("left_window", "Window in left", "meta-left", NULL, (SIGNAL_FUNC) key_left_window);
+-	key_bind("right_window", "Window in right", "meta-right", NULL, (SIGNAL_FUNC) key_right_window);
++	key_bind("upper_window", "Upper window", "mup", NULL, (SIGNAL_FUNC) key_upper_window);
++	key_bind("lower_window", "Lower window", "mdown", NULL, (SIGNAL_FUNC) key_lower_window);
++	key_bind("left_window", "Window in left", "mleft", NULL, (SIGNAL_FUNC) key_left_window);
++	key_bind("right_window", "Window in right", "mright", NULL, (SIGNAL_FUNC) key_right_window);
+ 	key_bind("active_window", "Go to next window with the highest activity", "meta-a", NULL, (SIGNAL_FUNC) key_active_window);
+ 	key_bind("next_window_item", "Next channel/query", "^X", NULL, (SIGNAL_FUNC) key_next_window_item);
+ 	key_bind("previous_window_item", "Previous channel/query", NULL, NULL, (SIGNAL_FUNC) key_previous_window_item);


Index: irssi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- irssi.spec	16 Aug 2007 20:38:54 -0000	1.23
+++ irssi.spec	19 Aug 2007 12:52:54 -0000	1.24
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.11
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Communications
@@ -86,6 +86,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sun Aug 19 2007 Marek Mahut <mmahut fedoraproject.org> - 0.8.11-5
+- Fixing properly irssi-support-meta-cursor-xterm.patch
+
 * Thu Aug 16 2007 Marek Mahut <mmahut redhat.com> - 0.8.11-4
 - Added irssi-support-meta-cursor-xterm.patch (#239511)