1. discarded term.h from the distribution

2. changed key_* to el_ley_* in the libedit key.h
   (because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c 
   (if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in 
   (now we don't include term.h in the el.h at all)


BitKeeper/deleted/.del-term.h~23716a5310508e0:
  Delete: cmd-line-utils/libedit/term.h
cmd-line-utils/libedit/Makefile.am:
  discarded term.h from the distribution
cmd-line-utils/libedit/el.c:
  changed 
  key_init -> el_key_init
  key_end -> el_key_end
cmd-line-utils/libedit/el.h:
  change 
    #include "term.h" 
  to 
    #include "libedit_term.h"
cmd-line-utils/libedit/key.c:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
cmd-line-utils/libedit/key.h:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
cmd-line-utils/libedit/map.c:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
cmd-line-utils/libedit/read.c:
  1. added definition of MIN
  2. fixed problems with undefined uint
  3. changed key_get to el_key_get
cmd-line-utils/libedit/term.c:
  1. discarded #include "term.h" at all
  2. changed functions key_* to el_key_*
  3. add declaration of el_key__decode_str
cmd-line-utils/libedit/tty.c:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
configure.in:
  discarded definition of SUNOS macro
  (libedit doesn't require it anymore)

1 files changed, 13 insertions, 12 deletions

diff --git a/cmd-line-utils/libedit/key.h b/cmd-line-utils/libedit/key.h
index 80d8626b894..9d83d7c2521 100644
--- a/cmd-line-utils/libedit/key.h
+++ b/cmd-line-utils/libedit/key.h
@@ -62,18 +62,19 @@ typedef struct el_key_t {
 #define	XK_NOD	2
 #define	XK_EXE	3
 
-protected int		 key_init(EditLine *);
-protected void		 key_end(EditLine *);
-protected key_value_t	*key_map_cmd(EditLine *, int);
-protected key_value_t	*key_map_str(EditLine *, char *);
-protected void		 key_reset(EditLine *);
-protected int		 key_get(EditLine *, char *, key_value_t *);
-protected void		 key_add(EditLine *, const char *, key_value_t *, int);
-protected void		 key_clear(EditLine *, el_action_t *, const char *);
-protected int		 key_delete(EditLine *, const char *);
-protected void		 key_print(EditLine *, const char *);
-protected void	         key_kprint(EditLine *, const char *, key_value_t *,
+protected int		 el_key_init(EditLine *);
+protected void		 el_key_end(EditLine *);
+protected key_value_t	*el_key_map_cmd(EditLine *, int);
+protected key_value_t	*el_key_map_str(EditLine *, char *);
+protected void		 el_key_reset(EditLine *);
+protected int		 el_key_get(EditLine *, char *, key_value_t *);
+protected void		 el_key_add(EditLine *, 
+                                    const char *, key_value_t *, int);
+protected void		 el_key_clear(EditLine *, el_action_t *, const char *);
+protected int		 el_key_delete(EditLine *, const char *);
+protected void		 el_key_print(EditLine *, const char *);
+protected void	         el_key_kprint(EditLine *, const char *, key_value_t *,
     int);
-protected char		*key__decode_str(const char *, char *, const char *);
+protected char		*el_key__decode_str(const char *, char *, const char *);
 
 #endif /* _h_el_key */