[Lush-cvs] lush/src unix.c,1.67,1.68

[Leon B. <le...@us...>]

Update of /cvsroot/lush/lush/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14868/src

Modified Files:
	unix.c 
Log Message:
fixed sync issues when using libedit in readline compat mode


Index: unix.c
===================================================================
RCS file: /cvsroot/lush/lush/src/unix.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** unix.c	14 Mar 2015 01:19:09 -0000	1.67
--- unix.c	14 Mar 2015 16:12:05 -0000	1.68
***************
*** 123,126 ****
--- 123,129 ----
  # ifndef RL_READLINE_VERSION
  #  define RL_READLINE_VERSION 0  /* non-gnu */
+ # elif ! defined(HAVE_RL_GETC)
+ #  undef RL_READLINE_VERSION  
+ #  define RL_READLINE_VERSION 0  /* non-gnu */
  # endif
  #endif
***************
*** 830,836 ****
        console_in_eventproc = 1;
        process_pending_events();
!       if (prep) rl_prep_terminal(1);
        console_in_eventproc = 0;
!       if (! handler) break;
        UNLOCK(handler);
      }
--- 833,841 ----
        console_in_eventproc = 1;
        process_pending_events();
!       if (prep)
! 	rl_prep_terminal(1);
        console_in_eventproc = 0;
!       if (! handler)
! 	break;
        UNLOCK(handler);
      }
***************
*** 849,858 ****
    return rl_getc(f);
  #else
    if (f && f != stdin)
      return getc(f);
    console_wait_for_char(TRUE);
!   if (break_attempt)
!     return EOF;
!   return getc(stdin);
  #endif
  }
--- 854,865 ----
    return rl_getc(f);
  #else
+   char buf;
    if (f && f != stdin)
      return getc(f);
    console_wait_for_char(TRUE);
!   if (!break_attempt)
!     if (read(0, &buf, 1) == 1)
!       return (int)buf;
!   return EOF;
  #endif
  }
***************
*** 911,915 ****
  
  
! #if RL_READLINE_VERSION > 0x402
  
  static char **
--- 918,922 ----
  
  
! #if RL_READLINE_VERSION > 0x400
  
  static char **
***************
*** 979,983 ****
    rl_getc_function = console_getc;
    /* completion */
! #if RL_READLINE_VERSION > 0x402
    rl_special_prefixes = special_prefixes;
    rl_basic_quote_characters = quote_characters;
--- 986,990 ----
    rl_getc_function = console_getc;
    /* completion */
! #if RL_READLINE_VERSION > 0x400
    rl_special_prefixes = special_prefixes;
    rl_basic_quote_characters = quote_characters;
***************
*** 991,995 ****
  #endif
    /* matching parenthesis */
! #if RL_READLINE_VERSION > 0x402
    rl_set_paren_blink_timeout(250000);
    rl_bind_key (')', rl_insert_close);
--- 998,1002 ----
  #endif
    /* matching parenthesis */
! #if RL_READLINE_VERSION > 0x400
    rl_set_paren_blink_timeout(250000);
    rl_bind_key (')', rl_insert_close);