Mailinglist Archive: opensuse-commit (1262 mails)
| < Previous | Next > |
commit bash
- From: root@xxxxxxx (h_root)
- Date: Thu, 14 Sep 2006 18:30:03 +0200 (CEST)
- Message-id: <20060914163003.9DD624261A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package bash
checked in at Thu Sep 14 18:30:03 CEST 2006.
--------
--- bash/bash.changes 2006-08-07 12:47:23.000000000 +0200
+++ bash/bash.changes 2006-09-14 18:16:23.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 14 18:14:50 CEST 2006 - werner@xxxxxxx
+
+- Add environment variable DEFAULT_BELL_STYLE to control the
+ bell style of the readline library without using intputrc.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash.spec ++++++
--- /var/tmp/diff_new_pack.2rlR1B/_old 2006-09-14 18:29:37.000000000 +0200
+++ /var/tmp/diff_new_pack.2rlR1B/_new 2006-09-14 18:29:37.000000000 +0200
@@ -16,7 +16,7 @@
Requires: readline >= 5.1
Autoreqprov: on
Version: 3.1
-Release: 28
+Release: 32
%define bash_vers 3.1
%define rl_vers 5.1
Summary: The GNU Bourne-Again Shell
@@ -66,7 +66,7 @@
Group: System/Libraries
Provides: bash:/lib/libreadline.so.5
Version: 5.1
-Release: 28
+Release: 32
Autoreqprov: on
%description -n readline
@@ -86,7 +86,7 @@
Group: Development/Libraries/C and C++
Provides: bash:/usr/lib/libreadline.a
Version: 5.1
-Release: 28
+Release: 32
Requires: readline = %{version}-%{release}, %{_libdir}/libncurses.so
Autoreqprov: on
@@ -321,6 +321,9 @@
%doc %{_mandir}/man3/readline.3.gz
%changelog -n bash
+* Thu Sep 14 2006 - werner@xxxxxxx
+- Add environment variable DEFAULT_BELL_STYLE to control the
+ bell style of the readline library without using intputrc.
* Mon Aug 07 2006 - werner@xxxxxxx
- Let readline-devel requires libncurses.so (bug #188673)
* Thu Jul 27 2006 - werner@xxxxxxx
++++++ readline-5.0-conf.patch ++++++
--- /var/tmp/diff_new_pack.2rlR1B/_old 2006-09-14 18:29:38.000000000 +0200
+++ /var/tmp/diff_new_pack.2rlR1B/_new 2006-09-14 18:29:38.000000000 +0200
@@ -1,6 +1,6 @@
--- lib/readline/bind.c
-+++ lib/readline/bind.c 2006-03-22 16:02:55.000000000 +0100
-@@ -723,6 +723,9 @@
++++ lib/readline/bind.c 2006-09-14 17:58:06.000000000 +0200
+@@ -723,6 +723,9 @@ rl_function_of_keyseq (keyseq, map, type
/* The last key bindings file read. */
static char *last_readline_init_file = (char *)NULL;
@@ -10,7 +10,14 @@
/* The file we're currently reading key bindings from. */
static const char *current_readline_init_file;
static int current_readline_init_include_level;
-@@ -790,7 +793,7 @@
+@@ -786,11 +789,14 @@ rl_re_read_init_file (count, ignore)
+ return r;
+ }
+
++/* Forward declarations */
++static int sv_bell_style PARAMS((const char *));
++
+ /* Do key bindings from a file. If FILENAME is NULL it defaults
to the first non-null filename from this list:
1. the filename used for the previous call
2. the value of the shell variable `INPUTRC'
@@ -19,7 +26,7 @@
If the file existed and could be opened and read, 0 is returned,
otherwise errno is returned. */
int
-@@ -802,13 +805,40 @@
+@@ -802,13 +808,43 @@ rl_read_init_file (filename)
{
filename = last_readline_init_file;
if (filename == 0)
@@ -56,12 +63,15 @@
filename = DEFAULT_INPUTRC;
+ read_system_init_file = 1;
+ }
++
++ sv_bell_style(sh_get_env_value("DEFAULT_BELL_STYLE"));
++
+ if (read_system_init_file)
+ _rl_read_init_file (SYSTEM_INPUTRC, 1);
#if defined (__MSDOS__)
if (_rl_read_init_file (filename, 0) == 0)
-@@ -1319,7 +1349,14 @@
+@@ -1319,7 +1355,14 @@ rl_parse_and_bind (string)
rl_macro_bind (seq, &funname[1], _rl_keymap);
}
else
@@ -77,6 +87,14 @@
free (seq);
return 0;
+@@ -1456,7 +1499,6 @@ typedef int _rl_sv_func_t PARAMS((const
+ #define V_INT 2
+
+ /* Forward declarations */
+-static int sv_bell_style PARAMS((const char *));
+ static int sv_combegin PARAMS((const char *));
+ static int sv_compquery PARAMS((const char *));
+ static int sv_editmode PARAMS((const char *));
--- lib/readline/rlconf.h
+++ lib/readline/rlconf.h 2006-03-22 16:23:22.000000000 +0100
@@ -35,10 +35,11 @@
@@ -94,7 +112,7 @@
#define DISPLAY_TABS
--- lib/readline/doc/rluser.texi
+++ lib/readline/doc/rluser.texi 2006-03-22 14:18:33.000000000 +0100
-@@ -336,7 +336,8 @@
+@@ -336,7 +336,8 @@ file is taken from the value of the shel
@ifclear BashFeatures
file is taken from the value of the environment variable @env{INPUTRC}. If
@end ifclear
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |