Merge branch 'vendor/TCSH'
authorSascha Wildner <saw@online.de>
Wed, 1 Apr 2020 18:55:08 +0000 (20:55 +0200)
committerSascha Wildner <saw@online.de>
Wed, 1 Apr 2020 18:55:08 +0000 (20:55 +0200)
1  2 
contrib/tcsh-6/ed.init.c
contrib/tcsh-6/ed.term.c
contrib/tcsh-6/ed.term.h
contrib/tcsh-6/sh.c
contrib/tcsh-6/sh.decls.h
contrib/tcsh-6/sh.func.c
contrib/tcsh-6/sh.init.c
contrib/tcsh-6/sh.set.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -399,7 -401,7 +401,8 @@@ extern     void              autoset_dspmbyte      (const 
  #if defined(AUTOSET_KANJI)
  extern        void              autoset_kanji (void);
  #endif
+ extern        void              update_wordchars      (void);
 +extern        void              exportpath    (Char **);
  
  /*
   * sh.time.c
Simple merge
Simple merge
@@@ -53,7 -49,9 +49,8 @@@ static        Char            *operate        (int, Char *, Cha
  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);
+ static        int              set_noclobber  (Char **);
  
  /*
   * C Shell