Merge branch 'vendor/TCSH'
authorJohn Marino <draco@marino.st>
Sat, 11 May 2013 01:29:13 +0000 (03:29 +0200)
committerJohn Marino <draco@marino.st>
Sat, 11 May 2013 01:29:13 +0000 (03:29 +0200)
Conflicts:
contrib/tcsh-6/sh.decls.h

1  2 
contrib/tcsh-6/ed.term.c
contrib/tcsh-6/sh.c
contrib/tcsh-6/sh.decls.h
contrib/tcsh-6/sh.func.c
contrib/tcsh-6/sh.set.c

Simple merge
Simple merge
@@@ -388,7 -394,9 +394,10 @@@ extern    Char             *unparse       (struct command 
  extern        void              update_dspmbyte_vars  (void);
  extern        void              autoset_dspmbyte      (const Char *);
  #endif
- extern        void             exportpath     (Char **);
+ #if defined(AUTOSET_KANJI)
+ extern        void              autoset_kanji (void);
+ #endif
++extern        void              exportpath    (Char **);
  
  /*
   * sh.time.c
Simple merge
@@@ -50,9 -50,10 +50,9 @@@ static       void             asx            (Char *, int, Char *
  static        struct varent   *getvx          (Char *, int);
  static        Char            *xset           (Char *, Char ***);
  static        Char            *operate        (int, Char *, Char *);
- static        void             putn1          (unsigned);
+ static        void             putn1          (tcsh_number_t);
  static        struct varent   *madrof         (Char *, struct varent *);
  static        void             unsetv1        (struct varent *);
 -static        void             exportpath     (Char **);
  static        void             balance        (struct varent *, int, int);
  
  /*