patch from suse

8 files changed, 25 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index 87df428..68bafa9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -220,10 +220,8 @@ maybe-uninstall-headers: uninstall-headers
 install:	$(INSTALL_TARGETS)
 
 install-static: installdirs $(STATIC_LIBS) install-headers install-doc
-	-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
 	$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
-	-$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
 	$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
 
@@ -246,7 +244,7 @@ uninstall-shared: maybe-uninstall-headers
 install-doc:	installdirs
 	-( if test -d doc ; then \
 		cd doc && \
-		${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
+		${MAKE} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
 	  fi )
 
 uninstall-doc:
diff --git a/complete.c b/complete.c
index 5ff198d..8bc2404 100644
--- a/complete.c
+++ b/complete.c
@@ -883,7 +883,7 @@ _rl_find_completion_word (fp, dp)
       /* We didn't find an unclosed quoted substring upon which to do
          completion, so use the word break characters to find the
          substring on which to complete. */
-      while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
+      while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)))
 	{
 	  scan = rl_line_buffer[rl_point];
 
@@ -1802,7 +1802,7 @@ rl_completion_matches (text, entry_function)
   match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
   match_list[1] = (char *)NULL;
 
-  while (string = (*entry_function) (text, matches))
+  while ((string = (*entry_function) (text, matches)))
     {
       if (matches + 1 == match_list_size)
 	match_list = (char **)xrealloc
@@ -1853,7 +1853,7 @@ rl_username_completion_function (text, state)
     }
 
 #if defined (HAVE_GETPWENT)
-  while (entry = getpwent ())
+  while ((entry = getpwent ()))
     {
       /* Null usernames should result in all users as possible completions. */
       if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 692a4e8..0c69da2 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -96,7 +96,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ) $(INFOOBJ) $(TEXTOBJ)
 	$(RM) $@
 	-${DVIPDF} $<
 
-all: info dvi html ps text
+all: info html
 nodvi: info html text
 
 info:	$(INFOOBJ)
diff --git a/doc/readline.3 b/doc/readline.3
index 2c45ed2..d0cb891 100644
--- a/doc/readline.3
+++ b/doc/readline.3
@@ -118,6 +118,14 @@ environment variable.  If that variable is unset, the default is
 .IR ~/.inputrc .
 If that file  does not exist or cannot be read, the ultimate default is
 .IR /etc/inputrc .
+If both files
+.I ~/.inputrc
+and
+.I /etc/inputrc
+exist readline will read first
+.I /etc/inputrc
+and then
+.IR ~/.inputrc .
 When a program which uses the readline library starts up, the
 init file is read, and the key bindings and variables are set.
 There are only a few basic constructs allowed in the
@@ -1270,6 +1278,9 @@ VI Command Mode functions
 .TP
 .FN ~/.inputrc
 Individual \fBreadline\fP initialization file
+.TP
+.FN /etc/inputrc
+System \fBreadline\fP initialization file
 .PD
 .SH AUTHORS
 Brian Fox, Free Software Foundation
diff --git a/packaging/readline.spec b/packaging/readline.spec
index b85672c..cba764d 100644
--- a/packaging/readline.spec
+++ b/packaging/readline.spec
@@ -6,7 +6,6 @@ Summary:        The Readline Library
 Url:            http://www.gnu.org/software/bash/bash.html
 Group:          System/Libraries
 Source0:        readline-%{rl_vers}.tar.bz2
-Source1:        readline-%{rl_vers}-patches.tar.bz2
 Source2:        baselibs.conf
 Patch20:        readline-%{rl_vers}.dif
 Patch21:        readline-4.3-input.dif
diff --git a/readline.c b/readline.c
index bd4d263..22ea7bc 100644
--- a/readline.c
+++ b/readline.c
@@ -733,7 +733,11 @@ _rl_dispatch_subseq (key, map, got_subseq)
 	{
 	  /* Special case rl_do_lowercase_version (). */
 	  if (func == rl_do_lowercase_version)
-	    return (_rl_dispatch (_rl_to_lower (key), map));
+	    {
+	      if (key == ANYOTHERKEY)
+		return -1;
+	      return (_rl_dispatch (_rl_to_lower (key), map));
+	    }
 
 	  rl_executing_keymap = map;
 
diff --git a/readline.h b/readline.h
index b71bf98..266f6ee 100644
--- a/readline.h
+++ b/readline.h
@@ -445,7 +445,7 @@ extern char *rl_filename_completion_function PARAMS((const char *, int));
 
 extern int rl_completion_mode PARAMS((rl_command_func_t *));
 
-#if 0
+#ifdef OLD_READLINE
 /* Backwards compatibility (compat.c).  These will go away sometime. */
 extern void free_undo_list PARAMS((void));
 extern int maybe_save_line PARAMS((void));
diff --git a/support/shobj-conf b/support/shobj-conf
index 358b278..c531784 100755
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -108,10 +108,11 @@ sunos5*|solaris2*)
 linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+	SHOBJ_LDFLAGS='-shared'
 
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+	SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+	SHLIB_LIBS=-lncurses
 	;;
 
 freebsd2*)