r2510 - in packages/libterm-readline-gnu-perl/trunk: . debian eg

Krzysztof Krzyzaniak eloy at costa.debian.org
Wed Apr 5 09:35:16 UTC 2006


Author: eloy
Date: 2006-04-05 09:35:15 +0000 (Wed, 05 Apr 2006)
New Revision: 2510

Modified:
   packages/libterm-readline-gnu-perl/trunk/Gnu.pm
   packages/libterm-readline-gnu-perl/trunk/Gnu.xs
   packages/libterm-readline-gnu-perl/trunk/INSTALL
   packages/libterm-readline-gnu-perl/trunk/META.yml
   packages/libterm-readline-gnu-perl/trunk/Makefile.PL
   packages/libterm-readline-gnu-perl/trunk/README
   packages/libterm-readline-gnu-perl/trunk/debian/changelog
   packages/libterm-readline-gnu-perl/trunk/debian/control
   packages/libterm-readline-gnu-perl/trunk/eg/perlsh
Log:
eloy: new upstream version


Modified: packages/libterm-readline-gnu-perl/trunk/Gnu.pm
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/Gnu.pm	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/Gnu.pm	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,9 +1,9 @@
 #
 #	Gnu.pm --- The GNU Readline/History Library wrapper module
 #
-#	$Id: Gnu.pm,v 1.95 2004-10-17 12:44:43-05 hiroo Exp $
+#	$Id: Gnu.pm,v 1.96 2006-04-02 01:59:53+09 hiroo Exp $
 #
-#	Copyright (c) 2004 Hiroo Hayashi.  All rights reserved.
+#	Copyright (c) 2006 Hiroo Hayashi.  All rights reserved.
 #
 #	This program is free software; you can redistribute it and/or
 #	modify it under the same terms as Perl itself.
@@ -73,7 +73,7 @@
     use DynaLoader;
     use vars qw($VERSION @ISA @EXPORT_OK);
 
-    $VERSION = '1.15';
+    $VERSION = '1.16';
 
     # Term::ReadLine::Gnu::AU makes a function in
     # `Term::ReadLine::Gnu::XS' as a method.
@@ -539,6 +539,7 @@
        rl_completion_suppress_quote		=> ['I', 35], # GRL 5.0
        rl_completion_found_quote		=> ['I', 36], # GRL 5.0
        rl_completion_mark_symlink_dirs		=> ['I', 37], # GRL 4.3
+       rl_prefer_env_winsize			=> ['I', 38], # GRL 5.1
 
        rl_startup_hook				=> ['F', 0],
        rl_event_hook				=> ['F', 1],
@@ -1098,6 +1099,10 @@
 
 	int	rl_variable_bind(const str variable, const str value)
 
+=item C<variable_value(VARIABLE)>
+
+	str	rl_variable_value(const str variable)	# GRL 5.1
+
 =item C<variable_dumper(READABLE)>
 
 	int	rl_variable_dumper(int readline)
@@ -1160,6 +1165,10 @@
 
 	(int rows, int cols)	rl_get_screen_size()	# GRL 4.2
 
+=item C<reset_screen_size()>
+
+	void	rl_reset_screen_size()	# GRL 5.1
+
 =item C<set_signals>
 
 	int	rl_set_signals()	# GRL 4.0
@@ -1438,6 +1447,8 @@
 	str rl_readline_name
 	filehandle rl_instream
 	filehandle rl_outstream
+	int rl_prefer_env_winsize (GRL 5.1)
+	pfunc rl_last_func (GRL 4.2)
 	pfunc rl_startup_hook
 	pfunc rl_pre_input_hook (GRL 4.0)
 	pfunc rl_event_hook
@@ -1445,7 +1456,6 @@
 	pfunc rl_redisplay_function
 	pfunc rl_prep_term_function (GRL 4.2)
 	pfunc rl_deprep_term_function (GRL 4.2)
-	pfunc rl_last_func (GRL 4.2)
 	Keymap rl_executing_keymap (read only)
 	Keymap rl_binding_keymap (read only)
 	str rl_executing_macro (GRL 4.2)

Modified: packages/libterm-readline-gnu-perl/trunk/Gnu.xs
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/Gnu.xs	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/Gnu.xs	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,9 +1,9 @@
 /*
  *	Gnu.xs --- GNU Readline wrapper module
  *
- *	$Id: Gnu.xs,v 1.108 2004-10-17 12:37:53-05 hiroo Exp $
+ *	$Id: Gnu.xs,v 1.110 2006-04-02 01:53:29+09 hiroo Exp $
  *
- *	Copyright (c) 2004 Hiroo Hayashi.  All rights reserved.
+ *	Copyright (c) 2006 Hiroo Hayashi.  All rights reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the same terms as Perl itself.
@@ -43,8 +43,18 @@
 #  endif
 #endif /* !__STDC__ */
 
-typedef char * t_xstr;		/* string which must be xfreeed */
+/*
+ * In Readline 4.2 many variables, function arguments, and function
+ * return values are now declared `const' where appropriate.
+ */
+#if (RL_READLINE_VERSION < 0x0402)
+#define CONST
+#else  /* (RL_READLINE_VERSION >= 0x0402) */
+#define CONST const
+#endif /* (RL_READLINE_VERSION >= 0x0402) */
 
+typedef char *	t_xstr;		/* string which must be xfreed */
+
 /*
  * compatibility definitions
  */
@@ -52,11 +62,20 @@
 /* rl_last_func() is defined in rlprivate.h */
 extern Function *rl_last_func;
 
+/* features introduced by GNU Readline 2.2 */
+#if (RL_READLINE_VERSION < 0x0202)
+static int rl_unbind_function_in_map(){ return 0; }
+static int rl_unbind_command_in_map(){ return 0; }
+#endif /* (RL_READLINE_VERSION < 0x0202) */
+
 /* features introduced by GNU Readline 4.0 */
 #if (RL_VERSION_MAJOR < 4)
 extern void rl_extend_line_buffer PARAMS((int));
 extern char **rl_funmap_names PARAMS((void));
+/* documented by Readline 4.2 but already implemented by 2.0. */
+extern int rl_add_funmap_entry PARAMS((CONST char *, Function *));
 
+/* dummy variable/function definition */
 static int rl_erase_empty_line = 0;
 static int rl_catch_signals = 1;
 static int rl_catch_sigwinch = 1;
@@ -65,12 +84,14 @@
 static VFunction *rl_prep_term_function;
 static VFunction *rl_deprep_term_function;
 
-static void rl_cleanup_after_signal(){};
-static void rl_free_line_state(){};
-static void rl_reset_after_signal(){};
-static void rl_resize_terminal(){};
-static void rl_prep_terminal(){};
-static void rl_deprep_terminal(){};
+static void rl_cleanup_after_signal(){}
+static void rl_free_line_state(){}
+static void rl_reset_after_signal(){}
+static void rl_resize_terminal(){}
+static void rl_prep_terminal(){}
+static void rl_deprep_terminal(){}
+static int rl_execute_next(){ return 0; }
+static void rl_display_match_list(){}
 /*
  * Before GNU Readline Library Version 4.0, rl_save_prompt() was
  * _rl_save_prompt and rl_restore_prompt() was _rl_restore_prompt().
@@ -86,12 +107,19 @@
 static int rl_already_prompted = 0;
 static int rl_num_chars_to_read = 0;
 static int rl_gnu_readline_p = 0;
+static int rl_on_new_line_with_prompt(){ return 0; }
 #endif /* (RL_READLINE_VERSION < 0x0401) */
 
 /* features introduced by GNU Readline 4.2 */
 #if (RL_READLINE_VERSION < 0x0402)
-/* Provide backwards-compatible entry points for old function names
-   which are rename from readline-4.2. */
+static int rl_set_prompt(){ return 0; }
+static int rl_clear_pending_input(){ return 0; }
+static int rl_set_keyboard_input_timeout(){ return 0; }
+static int rl_alphabetic(){ return 0; }
+static int rl_set_paren_blink_timeout(){ return 0; }
+static void rl_set_screen_size(int row, int col){}
+static void rl_get_screen_size(int *row, int *col){}
+
 typedef int rl_command_func_t PARAMS((int, int));
 typedef char *rl_compentry_func_t PARAMS((const char *, int));
 
@@ -102,6 +130,9 @@
 static int rl_readline_state = 0;
 static Function *rl_directory_rewrite_hook = NULL;
 static char *history_word_delimiters = " \t\n;&()|<>";
+
+/* Provide backwards-compatible entry points for old function names
+   which are rename from readline-4.2. */
 static void
 rl_free_undo_list ()
 {
@@ -114,14 +145,14 @@
   return crlf ();
 }
 
-#if (RL_VERSION_MAJOR >= 4)
 static void
 rl_tty_set_default_bindings (keymap)
 Keymap keymap;
 {
+#if (RL_VERSION_MAJOR >= 4)
   rltty_set_default_bindings (keymap);
-}
 #endif /* (RL_VERSION_MAJOR >= 4) */
+}
 
 static int
 rl_ding ()
@@ -152,14 +183,6 @@
 {
   return filename_completion_function ((char *)s, i);
 }
-
-/*
- * In Readline 4.2 many variables, function arguments, and function
- * return values are now declared `const' where appropriate.
- */
-#define CONST
-#else  /* (RL_READLINE_VERSION >= 0x0402) */
-#define CONST const
 #endif /* (RL_READLINE_VERSION >= 0x0402) */
 
 #if (RL_READLINE_VERSION < 0x0403)
@@ -170,6 +193,8 @@
 /* features introduced by GNU Readline 4.3 */
 static int rl_completion_suppress_append = 0;
 static int rl_completion_mark_symlink_dirs = 0;
+static void rl_replace_line(){}
+static int rl_completion_mode(){ return 0; }
 #endif /* (RL_READLINE_VERSION < 0x0403) */
 
 #if (RL_VERSION_MAJOR < 5)
@@ -179,13 +204,36 @@
 static int rl_completion_suppress_quote = 0;
 static int rl_completion_found_quote = 0;
 static Function *rl_completion_word_break_hook = NULL;
+static int rl_bind_key_if_unbound_in_map(){ return 0; }
+static int rl_bind_keyseq_in_map(){ return 0; }
+static int rl_bind_keyseq_if_unbound_in_map(){ return 0; }
+static void rl_tty_unset_default_bindings(){}
+static void add_history_time(){}
+static time_t history_get_time(){ return 0; }
 #endif /* (RL_VERSION_MAJOR < 5) */
 
+#if (RL_READLINE_VERSION < 0x0501)
+/* features introduced by GNU Readline 5.1 */
+static int rl_prefer_env_winsize = 0;
+static char *rl_variable_value(CONST char * v){ return NULL; }
+static void rl_reset_screen_size(){}
+
+#endif /* (RL_READLINE_VERSION < 0x0501) */
+
 /*
  * utility/dummy functions
  */                                                                                
+/* from GNU Readline:xmalloc.h */
+#ifndef PTR_T
+#ifdef __STDC__
+#  define PTR_T void *
+#else
+#  define PTR_T char *
+#endif
+#endif /* !PTR_T */
+
 /* from GNU Readline:xmalloc.c */
-extern char *xmalloc PARAMS((int));
+extern PTR_T xmalloc PARAMS((int));
 extern char *tgetstr PARAMS((const char *, char **));
 extern int tputs PARAMS((const char *, int, int (*)(int)));
 
@@ -198,12 +246,12 @@
  */
 #ifdef OS2_USEDLL
 /* from GNU Readline:xmalloc.c */
-extern char *xfree PARAMS((char *));
+extern PTR_T xfree PARAMS((PTR_T));
 
 #else /* not OS2_USEDLL */
 static void
 xfree (string)
-     char *string;
+     PTR_T string;
 {
   if (string)
     free (string);
@@ -212,7 +260,7 @@
 
 static char *
 dupstr(s)			/* duplicate string */
-     char *s;
+     CONST char * s;
 {
   /*
    * Use xmalloc(), because allocated block will be freed in the GNU
@@ -258,7 +306,7 @@
 /*
  * from readline-4.0:complete.c
  * Redefine here since the function defined as static in complete.c.
- * This function is used for default vaule for rl_filename_quoting_function.
+ * This function is used for default value for rl_filename_quoting_function.
  */
 static char * rl_quote_filename PARAMS((char *s, int rtype, char *qcp));
 
@@ -361,7 +409,8 @@
   { &rl_completion_quote_character,		0, 0 },	/* 34 */
   { &rl_completion_suppress_quote,		0, 0 },	/* 35 */
   { &rl_completion_found_quote,			0, 0 },	/* 36 */
-  { &rl_completion_mark_symlink_dirs,		0, 0 }	/* 37 */
+  { &rl_completion_mark_symlink_dirs,		0, 0 },	/* 37 */
+  { &rl_prefer_env_winsize,			0, 0 }	/* 38 */
 };
 
 /*
@@ -1254,7 +1303,7 @@
 }
 
 /*
- * make separate name space for low level XS functions and there methods
+ * make separate name space for low level XS functions and their methods
  */
 
 MODULE = Term::ReadLine::Gnu		PACKAGE = Term::ReadLine::Gnu::XS
@@ -1287,7 +1336,7 @@
  #
 rl_command_func_t *
 rl_add_defun(name, fn, key = -1)
-	const char *	name
+	CONST char *	name
 	SV *		fn
 	int key
     PROTOTYPE: $$;$
@@ -1385,7 +1434,6 @@
     OUTPUT:
 	RETVAL
 
-#if (RL_VERSION_MAJOR >= 5)
 int
 _rl_bind_key_if_unbound(key, function, map = rl_get_keymap())
 	int key
@@ -1397,8 +1445,6 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_VERSION_MAJOR >= 5) */
-
 int
 _rl_unbind_key(key, map = rl_get_keymap())
 	int key
@@ -1409,8 +1455,6 @@
     OUTPUT:
 	RETVAL
 
-#if (RL_READLINE_VERSION >= 0x0202)
-
  # rl_unbind_function_in_map() and rl_unbind_command_in_map() are introduced
  # by readline-2.2.
 
@@ -1434,9 +1478,6 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_READLINE_VERSION >= 0x0202) */
-
-#if (RL_VERSION_MAJOR >= 5)
 int
 _rl_bind_keyseq(keyseq, function, map = rl_get_keymap())
 	const char *keyseq
@@ -1448,25 +1489,23 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_VERSION_MAJOR >= 5) */
-
-#if (RL_READLINE_VERSION >= 0x0402)
  # rl_set_key() is introduced by readline-4.2 and equivalent with
  # rl_generic_bind(ISFUNC, keyseq, (char *)function, map).
 int
 _rl_set_key(keyseq, function, map = rl_get_keymap())
-	const char *	keyseq
+	CONST char *	keyseq
 	rl_command_func_t *	function
 	Keymap map
     PROTOTYPE: $$;$
     CODE:
+#if (RL_READLINE_VERSION >= 0x0402)
 	RETVAL = rl_set_key(keyseq, function, map);
+#else
+	RETVAL = rl_generic_bind(ISFUNC, keyseq, (char *)function, map);
+#endif
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
-
-#if (RL_VERSION_MAJOR >= 5)
 int
 _rl_bind_keyseq_if_unbound(keyseq, function, map = rl_get_keymap())
 	const char *keyseq
@@ -1478,8 +1517,6 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_VERSION_MAJOR >= 5) */
-
 int
 _rl_generic_bind_function(keyseq, function, map = rl_get_keymap())
 	CONST char *	keyseq
@@ -1671,11 +1708,9 @@
 	  }
 	}
 
-#if (RL_READLINE_VERSION >= 0x0402)
- # rl_add_funmap_entry() is introduced by readline-4.2.
 int
 _rl_add_funmap_entry(name, function)
-	const char *		name
+	CONST char *		name
 	rl_command_func_t *	function
     PROTOTYPE: $$
     CODE:
@@ -1683,8 +1718,6 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
-
  #
  #	2.4.5 Allowing Undoing
  #
@@ -1736,13 +1769,10 @@
 rl_on_new_line()
     PROTOTYPE:
 
-#if (RL_READLINE_VERSION >= 0x0401)
 int
 rl_on_new_line_with_prompt()
     PROTOTYPE:
 
-#endif /* (RL_READLINE_VERSION >= 0x0401) */
-
 int
 rl_reset_line_state()
     PROTOTYPE:
@@ -1782,14 +1812,10 @@
 	# should be defined as 'const char *'
 	char *		prompt
 
-#if (RL_READLINE_VERSION >= 0x0402)
-
 int
 rl_set_prompt(prompt)
 	const char *	prompt
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
-
  #
  #	2.4.7 Modifying Text
  #
@@ -1821,7 +1847,7 @@
 
 void
 rl_push_macro_input(macro)
-	const char *	macro
+	CONST char *	macro
     PROTOTYPE: $
     CODE:
 	rl_push_macro_input(dupstr(macro));
@@ -1843,16 +1869,11 @@
 	int c
     PROTOTYPE: $
 
-#if (RL_VERSION_MAJOR >= 4)
-
 int
 rl_execute_next(c)
 	int c
     PROTOTYPE: $
 
-#endif /* (RL_VERSION_MAJOR >= 4) */
-#if (RL_READLINE_VERSION >= 0x0402)
-
 int
 rl_clear_pending_input()
     PROTOTYPE:
@@ -1862,14 +1883,10 @@
 	int usec
     PROTOTYPE: $
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
-
  #
  #	2.4.9 Terminal Management
  #
 
-#if (RL_VERSION_MAJOR >= 4)
-
 void
 rl_prep_terminal(meta_flag)
 	int meta_flag
@@ -1886,9 +1903,6 @@
     CODE:
 	rl_tty_set_default_bindings(kmap);
 
-#endif /* (RL_VERSION_MAJOR >= 4) */
-
-#if (RL_VERSION_MAJOR >= 5)
 void
 _rl_tty_unset_default_bindings(kmap = rl_get_keymap())
 	Keymap kmap
@@ -1896,8 +1910,6 @@
     CODE:
 	rl_tty_unset_default_bindings(kmap);
 
-#endif /* (RL_VERSION_MAJOR >= 5) */
-
 int
 rl_reset_terminal(terminal_name = NULL)
 	CONST char *	terminal_name
@@ -1906,15 +1918,12 @@
  #
  #	2.4.10 Utility Functions
  #
-#if (RL_READLINE_VERSION >= 0x0403)
 void
 rl_replace_line(text, clear_undo = 0)
 	const char *text
 	int clear_undo
     PROTOTYPE: $$
 
-#endif /* (RL_READLINE_VERSION >= 0x0403) */
-
 int
 rl_initialize()
     PROTOTYPE:
@@ -1923,17 +1932,11 @@
 rl_ding()
     PROTOTYPE:
 
-#if (RL_READLINE_VERSION >= 0x0402)
-
 int
 rl_alphabetic(c)
 	int c
     PROTOTYPE: $
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
-
-#if (RL_VERSION_MAJOR >= 4)
-
 void
 rl_display_match_list(pmatches, plen = -1, pmax = -1)
 	SV *	pmatches
@@ -1977,8 +1980,6 @@
 	  xfree(matches);
 	}
 
-#endif /* (RL_VERSION_MAJOR >= 4) */
-
  #
  #	2.4.11 Miscellaneous Functions
  #
@@ -2018,20 +2019,22 @@
  # rl_variable_dumper is documented by Readline 4.2,
  # but have been implemented for 2.2.1.
 
+ # Do not free the string returned.
+char *
+rl_variable_value(variable)
+	CONST char *	variable
+    PROTOTYPE: $
+
 void
 rl_variable_dumper(readable = 0)
 	int readable
     PROTOTYPE: ;$
 
-#if (RL_READLINE_VERSION >= 0x0402)
-
 int
 rl_set_paren_blink_timeout(usec)
 	int usec
     PROTOTYPE: $
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
-
  # rl_get_termcap() is documented by readline-4.2 but it has been implemented 
  # from 2.2.1.
 
@@ -2103,8 +2106,6 @@
 rl_resize_terminal()
     PROTOTYPE:
 
-#if (RL_READLINE_VERSION >= 0x0402)
-
 void
 rl_set_screen_size(rows, cols)
 	int rows
@@ -2123,7 +2124,9 @@
 	  PUSHs(sv_2mortal(newSViv(cols)));
 	}
 
-#endif /* (RL_READLINE_VERSION >= 0x0402) */
+void
+rl_reset_screen_size()
+    PROTOTYPE:
 
 int
 rl_set_signals()
@@ -2142,7 +2145,6 @@
 	int what_to_do
     PROTOTYPE: ;$
 
-#if (RL_READLINE_VERSION >= 0x0403)
 int
 _rl_completion_mode(function)
 	rl_command_func_t *	function
@@ -2152,11 +2154,9 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_READLINE_VERSION >= 0x0403) */
-
 void
 rl_completion_matches(text, fn = NULL)
-	const char *	text
+	CONST char *	text
 	SV *		fn
     PROTOTYPE: $;$
     PPCODE:
@@ -2256,14 +2256,11 @@
 	CONST char *	string
     PROTOTYPE: $
 
-#if (RL_VERSION_MAJOR >= 5)
 void
 add_history_time(string)
 	CONST char *	string
     PROTOTYPE: $
 
-#endif /* (RL_VERSION_MAJOR >= 5) */
-
 HIST_ENTRY *
 remove_history(which)
 	int which
@@ -2352,7 +2349,6 @@
 	int offset
     PROTOTYPE: $
 
-#if (RL_VERSION_MAJOR >= 5)
  # To keep compatibility, I cannot make a function whose argument
  # is "HIST_ENTRY *".
 time_t
@@ -2370,8 +2366,6 @@
     OUTPUT:
 	RETVAL
 
-#endif /* (RL_VERSION_MAJOR >= 5) */
-
 int
 history_total_bytes()
     PROTOTYPE:

Modified: packages/libterm-readline-gnu-perl/trunk/INSTALL
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/INSTALL	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/INSTALL	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,5 +1,5 @@
 -*- Indented-text -*-
-#	$Id: INSTALL,v 1.21 2002-07-27 23:20:05-05 hiroo Exp $
+#	$Id: INSTALL,v 1.22 2006-04-02 02:11:51+09 hiroo Exp $
 
 1. How to Install Term::ReadLine::Gnu
 

Modified: packages/libterm-readline-gnu-perl/trunk/META.yml
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/META.yml	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/META.yml	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Term-ReadLine-Gnu
-version:      1.15
+version:      1.16
 version_from: Gnu.pm
 installdirs:  site
 requires:


Property changes on: packages/libterm-readline-gnu-perl/trunk/META.yml
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/libterm-readline-gnu-perl/trunk/Makefile.PL
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/Makefile.PL	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/Makefile.PL	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,9 +1,9 @@
 #
 #	Makefile.PL for Term::ReadLine::Gnu
 #
-#	$Id: Makefile.PL,v 1.27 2003-03-16 20:26:25-05 hiroo Exp $
+#	$Id: Makefile.PL,v 1.28 2005-10-01 10:44:06-05 hiroo Exp $
 #
-#	Copyright (c) 2003 Hiroo Hayashi.  All rights reserved.
+#	Copyright (c) 2005 Hiroo Hayashi.  All rights reserved.
 #		<hiroo.hayashi at computer.org>
 #
 #	This program is free software; you can redistribute it and/or
@@ -48,7 +48,9 @@
     # I emulate the behavior of the configure script for bash, and don't
     # know why AIX prefers curses.
     # libtermcap.a on HPUX cannot be used for dynamically linked binary.
-    my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux';
+    # Old Cygwin may require setting false (0).
+    my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux'
+			|| $Config{osname} eq 'cygwin';
     my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap'))
 	|| &search_lib('-lncurses')
 	    || &search_lib('-lcurses');
@@ -58,7 +60,8 @@
     $libs = "-lreadline $TERMCAP_LIB";
     # Latest Perl in FreeBSD does not need this hack. (Dec.2002)
     $libs .= ' -lcrypt' if ($Config{osname} =~ /freebsd/i);
-    $lddflags = ($Config{osname} =~ /cygwin/i) ? '-static' : '';
+    # If you are using old Cygwin, enable the following line.
+    #$lddflags = ($Config{osname} =~ /cygwin/i) ? '-static' : '';
 }
 
 # Check version of  GNU Readline Library (for version 4.2 and before)

Modified: packages/libterm-readline-gnu-perl/trunk/README
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/README	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/README	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,9 +1,9 @@
 	-*- Indented-text -*-
-$Id: README,v 1.25 2004-10-17 14:54:11-05 hiroo Exp $
+$Id: README,v 1.26 2006-04-02 02:18:19+09 hiroo Exp $
 
 Term::ReadLine::Gnu --- GNU Readline Library Wrapper Module
 
-	Copyright (c) 2004 Hiroo Hayashi.  All rights reserved.
+	Copyright (c) 2006 Hiroo Hayashi.  All rights reserved.
 
 	This program is free software; you can redistribute it and/or
 	modify it under the same terms as Perl itself.
@@ -42,10 +42,14 @@
 	of fixing his module.
 
 Prerequisites:
+	You must have Perl 5.7 or later.  If you have to use old Perl
+	for some reason, use Term::ReadLine::Gnu 1.09.  (I recommend
+	you to use newer Perl.)
+
 	You must have GNU Readline Library Version 2.1 or later.  See
 	INSTALL for more detail.
 
-	By a report GNU Readline Library may not work with perl with
+	A report said GNU Readline Library might not work with perl with
 	sfio.  Since I do not have sfio library, I am not sure.
 
 How to build/install:
@@ -62,6 +66,16 @@
 
 Revision History:
 
+1.16  2006-04-02
+	- fix Makefile.PL to work with the latest Cygwin.
+         (Use 1.15 for old Cygwin.)
+	- readline-5.1 support
+	    new function
+		variable_value
+		reset_screen_size
+	    new variable
+		prefer_env_winsize
+
 1.15  2004-10-17
 	- readline-5.0 support
 	    new function
@@ -87,7 +101,7 @@
           fix typo, etc.)
 
 1.13  2002-07-27
-	- readline-4.2 support
+	- readline-4.3 support
 	    new variables
 		rl_completion_suppress_append
 		rl_completion_mark_symlink_dirs

Modified: packages/libterm-readline-gnu-perl/trunk/debian/changelog
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/debian/changelog	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/debian/changelog	2006-04-05 09:35:15 UTC (rev 2510)
@@ -1,3 +1,9 @@
+libterm-readline-gnu-perl (1.16-1) UNRELEASED; urgency=low
+
+  *  New upstream release
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>  Wed,  5 Apr 2006 11:32:46 +0200
+
 libterm-readline-gnu-perl (1.15-3) unstable; urgency=low
 
   * Fixed maintainer email address. (Closes: #343484)

Modified: packages/libterm-readline-gnu-perl/trunk/debian/control
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/debian/control	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/debian/control	2006-04-05 09:35:15 UTC (rev 2510)
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
 Standards-Version: 3.6.2
 Build-Depends: debhelper (>= 4.0.19), perl (>= 5.8), libreadline5-dev, dpatch (>= 2.0.9)
 

Modified: packages/libterm-readline-gnu-perl/trunk/eg/perlsh
===================================================================
--- packages/libterm-readline-gnu-perl/trunk/eg/perlsh	2006-04-05 09:32:23 UTC (rev 2509)
+++ packages/libterm-readline-gnu-perl/trunk/eg/perlsh	2006-04-05 09:35:15 UTC (rev 2510)
@@ -33,6 +33,7 @@
 
 use strict;
 use Term::ReadLine;
+use POSIX;			#  for sigaction below
 
 use vars qw($PS1 $PS2 $HISTFILE $HISTSIZE $INPUTRC $STRICT
 	    $HOSTNAME $LOGNAME $CWP);
@@ -86,13 +87,14 @@
     $attribs->{special_prefixes} = '$@%&';
     $attribs->{completion_display_matches_hook}
 	= \&perl_symbol_display_match_list;
-    
-    $SIG{INT} = sub {
+
+    # See http://www.perldoc.com/perl5.8.4/pod/perlipc.html#Deferred-Signals-(Safe-Signals)
+    sigaction SIGINT, new POSIX::SigAction sub { # $SIG{INT} = sub {
 	$term->modifying;
 	$term->delete_text;
 	$attribs->{point} = $attribs->{end} = 0;
 	$term->redisplay;
-    };
+    } or die "Error setting SIGINT handler: $!\n";
 
     my ($strict, $command, @result);
     $strict = $STRICT ? '' : 'no strict;';
@@ -106,6 +108,13 @@
     &quit;
 }
 
+sub sigint {
+    $term->modifying;
+    $term->delete_text;
+    $attribs->{point} = $attribs->{end} = 0;
+    $term->redisplay;
+}
+
 sub quit {
     $term->WriteHistory($HISTFILE)
 	or warn "perlsh: cannot write history file: $!\n";




More information about the Pkg-perl-cvs-commits mailing list