diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2022-09-09 16:49:58 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2022-09-09 16:49:58 -0400 |
| commit | c752dbbbca9c5b84d8bf7b0c4610675a7222dca7 (patch) | |
| tree | 2ff421da974dc5cb5d6b929f5e96ccb642ac4c3d | |
| parent | 9b911311282118e89d55031b5e67e616fb9290bf (diff) | |
| download | readline-8.2-testing.tar.gz | |
Readline-8.2-rc4 releasereadline-8.2-rc4readline-8.2-testing
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | kill.c | 12 | ||||
| -rw-r--r-- | support/mkdist | 8 |
4 files changed, 22 insertions, 6 deletions
@@ -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 0a83d5b..15501fa 100644 --- 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 @@ -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 13c790f..b92503f 100644 --- 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 |