Browse Source

Revert "enable compiling with readline for macOS"

This reverts commit 11df2b7719.
pre-master-46
Holger Vogt 7 years ago
parent
commit
ceea40e012
  1. 2
      src/frontend/signal_handler.c
  2. 3
      src/main.c

2
src/frontend/signal_handler.c

@ -55,7 +55,7 @@ ft_sigintr_cleanup(void)
/* sjb - what to do for editline??? /* sjb - what to do for editline???
The following are not supported in editline */ The following are not supported in editline */
#if defined(HAVE_GNUREADLINE) && !defined(__APPLE__)
#if defined(HAVE_GNUREADLINE)
/* Clean up readline after catching signals */ /* Clean up readline after catching signals */
/* One or all of these might be superfluous */ /* One or all of these might be superfluous */
(void) rl_free_line_state(); (void) rl_free_line_state();

3
src/main.c

@ -605,8 +605,6 @@ app_rl_readlines(void)
rl_readline_name = application_name; rl_readline_name = application_name;
rl_instream = cp_in; rl_instream = cp_in;
rl_outstream = cp_out; rl_outstream = cp_out;
#ifndef __APPLE__
#ifndef X_DISPLAY_MISSING #ifndef X_DISPLAY_MISSING
if (dispdev->Input == X11_Input) if (dispdev->Input == X11_Input)
rl_event_hook = app_event_func; rl_event_hook = app_event_func;
@ -617,7 +615,6 @@ app_rl_readlines(void)
This variable is not supported by editline. */ This variable is not supported by editline. */
#if defined(HAVE_GNUREADLINE) #if defined(HAVE_GNUREADLINE)
rl_catch_sigwinch = 1; /* allow readline to respond to resized windows */ rl_catch_sigwinch = 1; /* allow readline to respond to resized windows */
#endif
#endif #endif
/* note that we want some mechanism to detect ctrl-D and expand it to exit */ /* note that we want some mechanism to detect ctrl-D and expand it to exit */

Loading…
Cancel
Save