From d62a6cf17f21acfa73d69828dd500f4ee0ada2a0 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 9 May 2014 17:01:27 -0500 Subject: readline 6.3.5 --- Library/Formula/readline.rb | 83 +++------------------------------------------ 1 file changed, 5 insertions(+), 78 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/readline.rb b/Library/Formula/readline.rb index 609401714..75c9e1e4f 100644 --- a/Library/Formula/readline.rb +++ b/Library/Formula/readline.rb @@ -5,7 +5,7 @@ class Readline < Formula url 'http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz' mirror 'http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz' sha256 '56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43' - version '6.3.3' + version '6.3.5' bottle do cellar :any @@ -26,7 +26,10 @@ EOS # reduce bug reports. # Upstream patches can be found in: # http://git.savannah.gnu.org/cgit/readline.git - patch :DATA + patch do + url "https://gist.githubusercontent.com/jacknagel/8df5735ae9273bf5ebb2/raw/827805aa2927211e7c3d9bb871e75843da686671/readline.diff" + sha1 "2d55658a2f01fa14a029b16fea29d20ce7d03b78" + end def install ENV.universal_binary @@ -43,79 +46,3 @@ EOS "libreadline.6.3.dylib" => "libreadline.6.2.dylib" end end - -__END__ -diff --git a/patchlevel b/patchlevel -index e0ba09d..fdf4740 100644 ---- a/patchlevel -+++ b/patchlevel -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --5 -+1 -diff --git a/readline.c b/readline.c -index 03eefa6..eb4eae3 100644 ---- a/readline.c -+++ b/readline.c -@@ -964,7 +964,7 @@ _rl_dispatch_subseq (key, map, got_subseq) - #if defined (VI_MODE) - if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && - key != ANYOTHERKEY && -- rl_key_sequence_length == 1 && /* XXX */ -+ _rl_dispatching_keymap == vi_movement_keymap && - _rl_vi_textmod_command (key)) - _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); - #endif -diff --git a/patchlevel b/patchlevel -index fdf4740..7cbda82 100644 ---- a/patchlevel -+++ b/patchlevel -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --1 -+2 -diff --git a/readline.c b/readline.c -index eb4eae3..abb29a0 100644 ---- a/readline.c -+++ b/readline.c -@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt) - r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); - - RL_CHECK_SIGNALS (); -- if (r == 0) /* success! */ -+ /* We only treat values < 0 specially to simulate recursion. */ -+ if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ - { - _rl_keyseq_chain_dispose (); - RL_UNSETSTATE (RL_STATE_MULTIKEY); -diff --git a/patchlevel b/patchlevel -index 7cbda82..ce3e355 100644 ---- a/patchlevel -+++ b/patchlevel -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --2 -+3 -diff --git a/util.c b/util.c -index fa3a667..58b55e2 100644 ---- a/util.c -+++ b/util.c -@@ -476,6 +476,7 @@ _rl_savestring (s) - return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s))); - } - -+#if defined (DEBUG) - #if defined (USE_VARARGS) - static FILE *_rl_tracefp; - -@@ -538,6 +539,7 @@ _rl_settracefp (fp) - _rl_tracefp = fp; - } - #endif -+#endif /* DEBUG */ - - - #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT) -- cgit v1.2.3