Merge branch 'm_getfld'

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
index d8a51a47bdc6a7ba73dd00021d3ed720e0564f7c,231528920a577816b4f620c511ad3e620e1fa9d9..1aea372a9822261d18bac28c13459fefb0cc3093
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -403,19 -445,12 +403,10 @@@ AS_CASE(["$host_os"]
          AS_IF([test -z "$CPPFLAGS"],[CPPFLAGS="-D_GNU_SOURCE"],
                  [CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"])])
  
 -AC_HEADER_STDC
  AC_HEADER_TIOCGWINSZ
 -AC_CHECK_HEADERS([errno.h fcntl.h crypt.h ncurses/termcap.h termcap.h \
 -                  langinfo.h wchar.h wctype.h iconv.h netdb.h \
 -                  sys/param.h sys/time.h sys/stream.h])
 +AC_CHECK_HEADERS([fcntl.h ncurses/termcap.h termcap.h langinfo.h \
 +                  wchar.h wctype.h sys/param.h sys/time.h sys/stream.h])
  
- dnl
- dnl Checks for _IO_write_ptr. A Linuxism used by nmh on linux. We
- dnl really use a whole set of them, but this check should be
- dnl sufficient.
- dnl
- AC_CHECK_HEADER(libio.h, [
-   AC_EGREP_HEADER(_IO_write_ptr, libio.h, [
-     AC_DEFINE(LINUX_STDIO,1,[Use the Linux _IO_*_ptr defines from <libio.h>.]) ]) ])
- 
  AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
    [Define to 1 if `struct winsize' requires <sys/ptem.h>.]),,
  [[#if HAVE_SYS_STREAM_H

diff --cc h/mh.h
Simple merge

diff --cc h/prototypes.h
Simple merge

diff --cc uip/inc.c
Simple merge

diff --cc uip/mhbuildsbr.c
Simple merge

diff --cc uip/mhlsbr.c
Simple merge

diff --cc uip/mhparse.c
Simple merge

diff --cc uip/msh.c
Simple merge

diff --cc uip/mshcmds.c
Simple merge

diff --cc uip/new.c
Simple merge

diff --cc uip/picksbr.c
Simple merge

diff --cc uip/post.c
Simple merge

diff --cc uip/prompter.c
Simple merge

diff --cc uip/rcvdist.c
Simple merge

diff --cc uip/rcvtty.c
Simple merge

diff --cc uip/scan.c
Simple merge

diff --cc uip/show.c
Simple merge

diff --cc uip/slocal.c
Simple merge

diff --cc uip/sortm.c
Simple merge

diff --cc uip/whatnowsbr.c
Simple merge