Readline-8.2-rc4 release

diff --git a/configure b/configure
index 2e8cf11f0eb77d9e28dabf433ae3ad05655549de..cb4e07a0004384c3167c63f3d21593f1ffd63299 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac for Readline 8.2, version 2.96.
+# From configure.ac for Readline 8.2, version 2.97.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.71 for readline 8.2.
 #
@@ -1406,7 +1406,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-curses           use the curses library instead of the termcap
                           library
-  --enable-shared-termcap-library
+  --with-shared-termcap-library
                           link the readline shared library against the
                           termcap/curses shared library [[default=NO]]
 

diff --git a/configure.ac b/configure.ac
index 0a83d5b6e8efed58694bef10f4669569b4ed6760..15501fa2dbfc4cd54759c0d596e9e65d2ec7abc5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script.
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_REVISION([for Readline 8.2, version 2.96])
+AC_REVISION([for Readline 8.2, version 2.97])
 
 AC_INIT(readline, 8.2, bug-readline@gnu.org)
 
@@ -43,7 +43,7 @@ opt_shared_termcap_lib=no
 
 dnl arguments to configure
 AC_ARG_WITH(curses, AS_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
-AC_ARG_WITH(shared-termcap-library, AS_HELP_STRING([--enable-shared-termcap-library], [link the readline shared library against the termcap/curses shared library [[default=NO]]]), opt_shared_termcap_lib=$withval)
+AC_ARG_WITH(shared-termcap-library, AS_HELP_STRING([--with-shared-termcap-library], [link the readline shared library against the termcap/curses shared library [[default=NO]]]), opt_shared_termcap_lib=$withval)
 
 if test "$opt_curses" = "yes"; then
        prefer_curses=yes

diff --git a/kill.c b/kill.c
index 61b744c96dc6d14fd6f282e85230524235aa532d..4cf933b20096ec0ceafa573fa3f06d43f4a178af 100644 (file)
--- a/kill.c
+++ b/kill.c
@@ -559,7 +559,7 @@ rl_yank_pop (int count, int key)
 int
 rl_vi_yank_pop (int count, int key)
 {
-  int l, n;
+  int l, n, origpoint;
 
   if (((rl_last_func != rl_vi_yank_pop) && (rl_last_func != rl_vi_put)) ||
       !rl_kill_ring)
@@ -569,11 +569,21 @@ rl_vi_yank_pop (int count, int key)
     }
 
   l = strlen (rl_kill_ring[rl_kill_index]);
+#if 0 /* TAG:readline-8.3 8/29/2022 matteopaolini1995@gmail.com */
+  origpoint = rl_point;
+  n = rl_point - l + 1;
+#else
   n = rl_point - l;
+#endif
   if (n >= 0 && STREQN (rl_line_buffer + n, rl_kill_ring[rl_kill_index], l))
     {
+#if 0 /* TAG:readline-8.3 */
+      rl_delete_text (n, n + l);               /* remember vi cursor positioning */
+      rl_point = origpoint - l;
+#else
       rl_delete_text (n, rl_point);
       rl_point = n;
+#endif
       rl_kill_index--;
       if (rl_kill_index < 0)
        rl_kill_index = rl_kill_ring_length - 1;

diff --git a/support/mkdist b/support/mkdist
index 13c790f471ec09e30b0a98bea90aeedcdec00c0d..b92503f856d2132ea7c05ed0f9ba27f4b7531a9f 100644 (file)
--- a/support/mkdist
+++ b/support/mkdist
@@ -78,7 +78,7 @@ fi
 dirmode=755
 filmode=644
 
-while read fname type mode
+while read fname type mode rest
 do
        [ -z "$fname" ] && continue
 
@@ -92,9 +92,15 @@ do
        F)      cp $SRCDIR/$fname $newdir/$fname ;;
        s)      ln -s $mode $newdir/$fname ; mode= ;;           # symlink
        l)      ln $mode $newdir/$fname ; mode= ;;              # hard link
+       c)      cp $SRCDIR/$mode $newdir/$fname ; mode=$filmode ;;      # copy to new name
        *)      echo "unknown file type $type" 1>&2 ;;
        esac
 
+       # allow for trailing comments
+       case "$mode" in
+       \#*)    mode= ;;
+       esac
+
        if [ -n "$mode" ]; then
                chmod $mode $newdir/$fname
        elif [ "$type" = "f" ]; then