🚀 go-pugleaf

This is part 1 of a 3 part patch

Fix unintended change where forwarding without editing started adding
prefix chars
From: Syd

Here are the doc changes for my additions to the alias system and
the new switches to listalias.
From: "Robert L. Howard" <robert.howard@matd.gatech.edu>

Add a c)hange alias, -u and -t options to listalias to list only user
and only system aliases respectively.
From: "Robert L. Howard" <robert.howard@matd.gatech.edu>

Fix formatting and typograpical problems
From: dwolfe@pffft.sps.mot.com (Dave Wolfe)

Always pass three parameters to header_cmp().
From: chip@tct.com (Chip Salzenberg)

Fixed where when doing ! or | and ti/te is enabled, one doesn't see the
"Press any key to return to ELM:" message. because the screens are
switched before the message is printed.
From: Jan Djarv <Jan.Djarv@sa.erisoft.se>

Quote from the filter of phrase to prevent RFC-822 parsing problems
From: Syd via request from Ian Stewartson <istewart@dlvax2.datlog.co.uk>

EDITOROPTS and DEFEDITOR appear to be unused but here is 
a patch to make use of $editoropts.
From: "Robert L. Howard" <robert.howard@matd.gatech.edu>

Fix confirm prompts to follow Elm style in confirm append/create
From: Syd

Fix messages and nls messages to match.  Plus use want_to
where appropriate.
From: Syd, via prompting from Jan Djarv <Jan.Djarv@sa.erisoft.se>

Add Ignore of CONT signals on exit for Ultrix
From: Syd via prompt from Bob Mason

Add lstat call for proper detection of symlink in leavembox.c
From: Syd via prompt from Bryan Curnutt

Make copy_sans_escape expand tabs to prevent subject displays from getting messed up
From: Syd via request from pgf@Cayman.COM (Paul Fox)

remove leading 0s from access() defs as it confuses some
compilers (and I know it shouldnt)
From: Syd

Add missing quote check to whitespace error check loop
From: "Robert L. Howard" <robert.howard@matd.gatech.edu>

Fix:	From rn, say "| patch -p -N -d DIR", where DIR is your elm source
	directory.  Outside of rn, say "cd DIR; patch -p -N <thisarticle".
	If you don't have the patch program, apply the following by hand,
	or get patch (version 2.0, latest patchlevel).

	After patching:
		do nothing, apply patchs 19 and 20 next

	If patch indicates that patchlevel is the wrong version, you may need
	to apply one or more previous patches, or the patch may already
	have been applied.  See the patchlevel.h file to find out what has or
	has not been applied.  In any event, don't continue with the patch.

	If you are missing previous patches they can be obtained from our:
	archive server.

	Syd Weinstein
	elm@DSI.COM

	The patches are available from the dsinc archive server
	Send the following message to archive-server@DSI.COM for
	a list of available patches:

	Subject: patch list
	send index elm

Index: hdrs/patchlevel.h
Prereq: "17"
*** ../elm2.4/hdrs/patchlevel.h	Thu Dec 24 18:56:58 1992
--- hdrs/patchlevel.h	Thu Dec 24 18:57:39 1992
***************
*** 1 ****
! #define PATCHLEVEL "17"
--- 1 ----
! #define PATCHLEVEL "18"

Index: Changes
*** ../elm2.4/Changes	Sat Oct  3 21:13:57 1992
--- Changes	Sun Dec 20 00:19:11 1992
***************
*** 2,8 ****
  between Releases 2.3 and 2.4.  Please remember that Elm is a volunteer
  project, we did what we had time for, and perhaps, what interested us.
  If you have a suggestion, or a fix, submit it, and better yet,
! volunteer to impliment it.
  
          Syd Weinstein		Sat Oct  3 16:55:49 EDT 1992
  
--- 2,8 ----
  between Releases 2.3 and 2.4.  Please remember that Elm is a volunteer
  project, we did what we had time for, and perhaps, what interested us.
  If you have a suggestion, or a fix, submit it, and better yet,
! volunteer to implement it.
  
          Syd Weinstein		Sat Oct  3 16:55:49 EDT 1992
  
***************
*** 24,32 ****
  
  Add sender to filter
  
! impliments a -q flag to filter to quiet any logging of filtering actions.
  
! More intellient make install target include better support for man pages
  
  User definable Options Screen
  
--- 24,32 ----
  
  Add sender to filter
  
! implements a -q flag to filter to quiet any logging of filtering actions.
  
! More intelligent make install target include better support for man pages
  
  User definable Options Screen
  
***************
*** 88,94 ****
  
  Change newmail to not keep files open to prevent systems with read
  locks from appending to the file.  Add print_prefix to force printing
! the prefix if specified and only one folder being monitered.
  
  And many bug fixes.
  
--- 88,94 ----
  
  Change newmail to not keep files open to prevent systems with read
  locks from appending to the file.  Add print_prefix to force printing
! the prefix if specified and only one folder being monitored.
  
  And many bug fixes.
  

Index: Configure
Prereq: 5.20
*** ../elm2.4/Configure	Thu Dec 24 18:56:31 1992
--- Configure	Thu Dec 24 18:51:09 1992
***************
*** 8,14 ****
  # and edit it to reflect your system.  Some packages may include samples
  # of config.h for certain machines, so you might look for one of those.)
  #
! # $Header: /home/syd/elm.rel/RCS/Configure,v 5.20 1992/12/12 01:50:57 syd Exp $
  #
  # Yes, you may rip this off to use in other distribution packages.
  # (Note: this Configure script was generated automatically.  Rather than
--- 8,14 ----
  # and edit it to reflect your system.  Some packages may include samples
  # of config.h for certain machines, so you might look for one of those.)
  #
! # $Header: /home/syd/elm.rel/RCS/Configure,v 5.21 1992/12/24 23:51:02 syd Exp $
  #
  # Yes, you may rip this off to use in other distribution packages.
  # (Note: this Configure script was generated automatically.  Rather than
***************
*** 314,320 ****
  attrlist="$attrlist ns32000 ns16000 iAPX286 mc300 mc500 mc700 sparc"
  attrlist="$attrlist nsc32000 sinix xenix venix posix ansi M_XENIX"
  attrlist="$attrlist $mc68k __STDC__ UTS M_I8086 M_I186 M_I286 M_I386"
! attrlist="$attrlist i186 __m88k__ m88k DGUX __DGUX__ NeXT _AIX"
  pth="/bin /usr/bin /usr/ucb /sbin /usr/sbin /usr/local /usr/local/bin /usr/lbin"
  pth="$pth /usr/5bin /vol/local/bin /etc /usr/bsd /usr/lib /usr/ccs/lib /usr/ccs/bin /lib"
  pth="$pth /usr/local/lib /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/bin /bsd4.3/usr/ucb"
--- 314,320 ----
  attrlist="$attrlist ns32000 ns16000 iAPX286 mc300 mc500 mc700 sparc"
  attrlist="$attrlist nsc32000 sinix xenix venix posix ansi M_XENIX"
  attrlist="$attrlist $mc68k __STDC__ UTS M_I8086 M_I186 M_I286 M_I386"
! attrlist="$attrlist i186 __m88k__ m88k DGUX __DGUX__ NeXT _AIX ultrix"
  pth="/bin /usr/bin /usr/ucb /sbin /usr/sbin /usr/local /usr/local/bin /usr/lbin"
  pth="$pth /usr/5bin /vol/local/bin /etc /usr/bsd /usr/lib /usr/ccs/lib /usr/ccs/bin /lib"
  pth="$pth /usr/local/lib /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/bin /bsd4.3/usr/ucb"
***************
*** 777,783 ****
  entries to add to the users ".calendar" (or whatever) file.  These
  entries are then processed by the system program calendar.  To use
  this feature it needs to be enabled.  The name of the per user calendar
! file used by your systems calendar program is also required.
  EOM
  
  case "$d_calendar" in
--- 777,783 ----
  entries to add to the users ".calendar" (or whatever) file.  These
  entries are then processed by the system program calendar.  To use
  this feature it needs to be enabled.  The name of the per user calendar
! file used by your system's calendar program is also required.
  EOM
  
  case "$d_calendar" in
***************
*** 1032,1038 ****
      $cat <<EOM
  
  The installed unformatted manual pages can have various extensions to suit the
! conventions of the host operating system.  Ex.   page.1
  
  Note that the period '.' must be included as part of the extension.
  
--- 1032,1038 ----
      $cat <<EOM
  
  The installed unformatted manual pages can have various extensions to suit the
! conventions of the host operating system, for example "page.1".
  
  Note that the period '.' must be included as part of the extension.
  
***************
*** 1192,1198 ****
      $cat <<EOM
  
  The installed formatted manual pages can have various extensions to suit the
! conventions of the host operating system.  (Ex. page.1)
  
  Note that the period '.' must be included as part of the extension.
  
--- 1192,1198 ----
      $cat <<EOM
  
  The installed formatted manual pages can have various extensions to suit the
! conventions of the host operating system, for example "page.1".
  
  Note that the period '.' must be included as part of the extension.
  
***************
*** 1215,1223 ****
  	if $test -f $pack; then
  	    $cat <<EOM
  
! The formatted manual pages may be packed (.z suffix) or compressed (.Z)
! or left unpacked on your system.  The next two questions will deal with
! how you want the formatted manual pages installed.  Answering no to
  both packed and compressed will leave them unpacked.  Only one of packed
  or compressed can be chosen.
  
--- 1215,1223 ----
  	if $test -f $pack; then
  	    $cat <<EOM
  
! The formatted manual pages may be packed (.z suffix) or compressed (.Z
! suffix) or left unpacked on your system.  The next two questions will deal
! with how you want the formatted manual pages installed.  Answering no to
  both packed and compressed will leave them unpacked.  Only one of packed
  or compressed can be chosen.
  
***************
*** 1613,1619 ****
  Some C compilers have problems with their optimizers, by default, $package
  compiles with the -O flag to use the optimizer.  Alternately, you might
  want to use the symbolic debugger, which uses the -g flag (on traditional
! Unix systems).  Either flag can be specified here.  To use neither flag,
  specify the word "none".
    
  EOH
--- 1613,1619 ----
  Some C compilers have problems with their optimizers, by default, $package
  compiles with the -O flag to use the optimizer.  Alternately, you might
  want to use the symbolic debugger, which uses the -g flag (on traditional
! UNIX systems).  Either flag can be specified here.  To use neither flag,
  specify the word "none".
    
  EOH
***************
*** 1780,1789 ****
  
  $cat <<EOM
   
! Some versions of Unix support shared libraries, which make
  executables smaller but make load time slightly longer.
  
! On some systems, mostly newer Unix System V's, the shared library
  is included by putting the option "-lc_s" as the last thing on the
  cc command line when linking.  Other systems use shared libraries
  by default.  There may be other libraries needed to compile $package
--- 1780,1789 ----
  
  $cat <<EOM
   
! Some versions of UNIX support shared libraries, which make
  executables smaller but make load time slightly longer.
  
! On some systems, mostly newer UNIX System V's, the shared library
  is included by putting the option "-lc_s" as the last thing on the
  cc command line when linking.  Other systems use shared libraries
  by default.  There may be other libraries needed to compile $package
***************
*** 1832,1843 ****
  	;;
  esac
  
! : check to see if the macros are 8 bit clean, ask the user
  :
  $cat <<EOM
  
  
! Not all environments are restricted to the ASCII 7 bit character set.
  For example, the ISO 8859/1 (Latin alphabet no. 1) character set,
  consisting of 8 bits and 191 printable characters, is becoming
  more and more common, especially in non-English speaking countries.
--- 1832,1843 ----
  	;;
  esac
  
! : check to see if the macros are 8-bit clean, ask the user
  :
  $cat <<EOM
  
  
! Not all environments are restricted to the ASCII 7-bit character set.
  For example, the ISO 8859/1 (Latin alphabet no. 1) character set,
  consisting of 8 bits and 191 printable characters, is becoming
  more and more common, especially in non-English speaking countries.
***************
*** 1844,1854 ****
  
  Unfortunately, not all isprint() functions or macros, which ELM
  uses to determine whether a character is printable or not, will
! handle non-ASCII (8 bit) characters properly.  It is suggested that you
! start with this value configured to handle 8 bit characters correctly
  and if there are problems with Elm aborting while displaying messages
  that use extended character sets to reconfigure Elm to only display
! 7 bit characters.
  
  EOM
  
--- 1844,1854 ----
  
  Unfortunately, not all isprint() functions or macros, which ELM
  uses to determine whether a character is printable or not, will
! handle non-ASCII (8-bit) characters properly.  It is suggested that you
! start with this value configured to handle 8-bit characters correctly
  and if there are problems with Elm aborting while displaying messages
  that use extended character sets to reconfigure Elm to only display
! 7-bit characters.
  
  EOM
  
***************
*** 1858,1864 ****
  esac
  
  echo "  "
! rp="Should Elm assume that isprint() won't break on non-ascii characters? [$dflt]"
  $echo $n "$rp $c"
  . myread
  case "$ans" in
--- 1858,1864 ----
  esac
  
  echo "  "
! rp="Should Elm assume that isprint() won't break on non-ASCII characters? [$dflt]"
  $echo $n "$rp $c"
  . myread
  case "$ans" in
***************
*** 1875,1881 ****
  
  $cat << EOM
  
! Some modern Mail Transport Agents (mailer) support the Content-Length: header.
  In doing so, they do not wish to have messages escaped to protect 'From ' lines
  in the body of the message, among other strings.  Does the Mail Transport Agent
  in use on this system honor the Content-Length: header?
--- 1875,1881 ----
  
  $cat << EOM
  
! Some modern Mail Transport Agents (mailers) support the Content-Length: header.
  In doing so, they do not wish to have messages escaped to protect 'From ' lines
  in the body of the message, among other strings.  Does the Mail Transport Agent
  in use on this system honor the Content-Length: header?
***************
*** 2155,2161 ****
  
  Elm can either display the hostname on the index page, or just
  the folder name.  If the hostname is displayed, the folder name
! will read hostname:folder, if not it will just read folder.
  
  EOM
  rp="Should Elm display the hostname as part of the folder name? [$dflt]"
--- 2155,2161 ----
  
  Elm can either display the hostname on the index page, or just
  the folder name.  If the hostname is displayed, the folder name
! will read hostname:folder.  If not it will just read folder.
  
  EOM
  rp="Should Elm display the hostname as part of the folder name? [$dflt]"
***************
*** 2208,2214 ****
  usage of a network, and MTA/MUAs in use, you may want to configure more
  than one of the following Mail Locking Protocols.  It is recommended
  that you use as many as are possible on your system to avoid problems.
! All systems can support the dot locking method (.lock files)
  
  Available locking protocols:
  	dot locking (.lock)
--- 2208,2214 ----
  usage of a network, and MTA/MUAs in use, you may want to configure more
  than one of the following Mail Locking Protocols.  It is recommended
  that you use as many as are possible on your system to avoid problems.
! All systems can support the dot locking method (.lock files).
  
  Available locking protocols:
  	dot locking (.lock)
***************
*** 2294,2300 ****
      lock_dir=/tmp
  fi
  echo " "
! echo "Non mailbox locks will use the $lock_dir directory"
  echo " "
  
  : now get the host name
--- 2294,2300 ----
      lock_dir=/tmp
  fi
  echo " "
! echo "Non-mailbox locks will use the $lock_dir directory"
  echo " "
  
  : now get the host name
***************
*** 2474,2480 ****
  $cat <<'EOH'
   
  I can set things up so that your shell scripts and binaries are more portable,
! at what may be a noticable cost in performance.  In particular, if you
  ask to be portable, the following happens:
  
       1) shell scripts will rely on the PATH variable rather than using
--- 2474,2480 ----
  $cat <<'EOH'
   
  I can set things up so that your shell scripts and binaries are more portable,
! at what may be a noticeable cost in performance.  In particular, if you
  ask to be portable, the following happens:
  
       1) shell scripts will rely on the PATH variable rather than using
***************
*** 2761,2770 ****
  strings_f=`$expr "$strings" : ".*/\(.*\)"`
  if $test "$strings_f" = "string.h"; then
  	d_strings="$undef"
! 	echo Using string.h instead of strings.h
  else
  	d_strings="$define"
! 	echo Using strings.h instead of string.h
  fi
  pwdinsys=`loc pwd.h "" /usr/include $includepath`
  if $test -z "$pwdinsys"; then
--- 2761,2770 ----
  strings_f=`$expr "$strings" : ".*/\(.*\)"`
  if $test "$strings_f" = "string.h"; then
  	d_strings="$undef"
! 	echo "Using string.h instead of strings.h"
  else
  	d_strings="$define"
! 	echo "Using strings.h instead of string.h"
  fi
  pwdinsys=`loc pwd.h "" /usr/include $includepath`
  if $test -z "$pwdinsys"; then
***************
*** 2832,2839 ****
  Some systems run MMDF as their Mail Transport Agent.  MMDF uses a
  different way of delimiting messages in the mailbox files.  Other
  systems don't run MMDF but use the MMDF separator in their mailbox
! files.  The MMDF separator is usually this is a series of four Control
! A's.  $package needs to know if this system uses the MMDF style message
  separator in its mailbox files.
  
  EOM
--- 2832,2839 ----
  Some systems run MMDF as their Mail Transport Agent.  MMDF uses a
  different way of delimiting messages in the mailbox files.  Other
  systems don't run MMDF but use the MMDF separator in their mailbox
! files.  The MMDF separator is usually a series of four Control A's.
! $package needs to know if this system uses the MMDF style message
  separator in its mailbox files.
  
  EOM
***************
*** 2953,2959 ****
  $cat <<EOM
   
  Elm has the ability to place a call to the GNU ispell spelling checker
! on its post message entry/pre message send menu.
  EOM
  if $test -n "$dflt_path"; then
  	$echo "Configure has found ispell as $dflt_path"
--- 2953,2959 ----
  $cat <<EOM
   
  Elm has the ability to place a call to the GNU ispell spelling checker
! on its post-message-entry/pre-message-send menu.
  EOM
  if $test -n "$dflt_path"; then
  	$echo "Configure has found ispell as $dflt_path"
***************
*** 3128,3138 ****
  most recent version is on thumper.bellcore.com [128.96.41.1], or ask
  the archie servers for the nearest site.
  
! Compiling of elm even with MIME support enabled would not depend on
! the metamail package. But you would not be able to use nearly all of the
! MIME features as long as you don't have metamail installed. Metamail with
! its companion programs (mmencode) must be installed somewhere in the
! search path, usually /usr/local/bin.
    
  
  
--- 3128,3138 ----
  most recent version is on thumper.bellcore.com [128.96.41.1], or ask
  the archie servers for the nearest site.
  
! Compiling elm even with MIME support enabled would not depend on the
! metamail package, but you would not be able to use nearly all of the
! MIME features as long as you don't have metamail installed.  Metamail
! with its companion programs (mmencode) must be installed somewhere in
! the search path, usually /usr/local/bin.
    
  
  
***************
*** 3298,3305 ****
  		d_usedomain="$undef"
  		$cat <<EOM
  
! Since your mailer does not understand internet addresses, undefining
! usedomain, your domain name will not be appended to the hostname on
  outbound mail.
  
  EOM
--- 3298,3305 ----
  		d_usedomain="$undef"
  		$cat <<EOM
  
! Since your mailer does not understand internet addresses, I'm undefining
! usedomain so your domain name will not be appended to the hostname on
  outbound mail.
  
  EOM
***************
*** 3602,3608 ****
  *)	   dflt=n;;
  esac
  echo " "
! rp="Should it REMOVE the lockfile after $maxattempts checks? [$dflt]"
  $echo $n "$rp $c"
  . myread
  case "$ans" in
--- 3602,3608 ----
  *)	   dflt=n;;
  esac
  echo " "
! rp="Should it REMOVE the lock file after $maxattempts checks? [$dflt]"
  $echo $n "$rp $c"
  . myread
  case "$ans" in
***************
*** 3647,3653 ****
      fi
  done
  
! : determine the group of the mail directory- what group elm should use
  mailgrp=`$ls -lgd $maildir/.`
  mailgrp=`$expr "$mailgrp" : "[ld][rwxstS-]*[ 0123456789]*\(.*\)"`
  : now mailgrp is either    user group size mon day time/year name
--- 3647,3653 ----
      fi
  done
  
! : determine the group of the mail directory and what group elm should use
  mailgrp=`$ls -lgd $maildir/.`
  mailgrp=`$expr "$mailgrp" : "[ld][rwxstS-]*[ 0123456789]*\(.*\)"`
  : now mailgrp is either    user group size mon day time/year name
***************
*** 3673,3679 ****
  "$undef")	dflt=n;;
  *)		dflt=y;;
  esac
! echo " "
  rp="Am I going to be running as a setgid program? [$dflt]"
  $echo $n "$rp $c"
  . myread
--- 3673,3695 ----
  "$undef")	dflt=n;;
  *)		dflt=y;;
  esac
! cat <<EOM
! 
! Elm needs to be installed and run as a setgid program only if the mail
! spool directory permissions do not allow world write access.  If your
! mail spool directory has the permissions:
! 
! drwxrwxr-x  3 root     mail          512 Dec 24 17:20 /usr/mail
! 
! then Elm must be setgid to the same group as the mail spool directory
! (in this case group mail).  However, if the spool permissions look
! like:
! 
! drwxrwsrwt  2 root     staff         512 Dec 21 20:14 /usr/spool/mail
! 
! then Elm should not be installedi or run as a setgid program.
! 
! EOM
  rp="Am I going to be running as a setgid program? [$dflt]"
  $echo $n "$rp $c"
  . myread
***************
*** 3809,3817 ****
  $cat <<EOM
   
  Some sites wish to disable the usage of the shell escape from Elm.
! If you choose, you can not allow subshells from withing Elm.
  
! Note: This only controls Elms usage of the ! command.  Any pager or
  editor could still allow subshells.
  
  EOM
--- 3825,3833 ----
  $cat <<EOM
   
  Some sites wish to disable the usage of the shell escape from Elm.
! If you choose, you can disallow subshells from within Elm.
  
! Note: This only controls Elm's usage of the ! command.  Any pager or
  editor could still allow subshells.
  
  EOM
***************
*** 3917,3929 ****
  	for i_time in '-DI_TIME' ''; do
  	    for i_systime in '-DI_SYSTIME' ''; do
  		case "$flags" in
! 		'') echo Trying $i_time $i_systime $d_systimekernel $s_timeval
  		    if $cc $ccflags $i_time $i_systime $d_systimekernel $s_timeval \
  			    try.c -o try >/dev/null 2>&1 ; then
  			set X $i_time $i_systime $d_systimekernel $s_timeval
  			shift
  			flags="$*"
! 			echo Succeeded with $flags
  		    fi
  		    ;;
  		esac
--- 3933,3945 ----
  	for i_time in '-DI_TIME' ''; do
  	    for i_systime in '-DI_SYSTIME' ''; do
  		case "$flags" in
! 		'') echo "Trying $i_time $i_systime $d_systimekernel $s_timeval"
  		    if $cc $ccflags $i_time $i_systime $d_systimekernel $s_timeval \
  			    try.c -o try >/dev/null 2>&1 ; then
  			set X $i_time $i_systime $d_systimekernel $s_timeval
  			shift
  			flags="$*"
! 			echo "Succeeded with $flags"
  		    fi
  		    ;;
  		esac
***************
*** 3945,3950 ****
--- 3961,3975 ----
  esac
  $rm -f try.c try
  
+ : see if there is a tzname
+ set tzname d_tzname
+ eval $inlibc
+ 
+ if $test "$d_tzname" = "$undef"; then
+     set _tzname d_tzname
+     eval $inlibc
+ fi
+ 
  timeincl=""
  if $test "$i_time" = define ; then
      timeincl="/usr/include/time.h"
***************
*** 3960,3984 ****
      echo "You have timezone defined in $timeincl rather than tz_minuteswest."
      d_tz_min="$undef"
  fi
- $rm -f try.c
- : see if there is a tzname
- set tzname d_tzname
- eval $inlibc
- 
- if $test "$d_tzname" = "$undef"; then
-     set _tzname d_tzname
-     eval $inlibc
- fi
  
  #	try alternate test for nm commands that have problems
  #	with data items being parsed
  
! if $test "$d_tzname" = "$undef"; then
!     if $contains tzname /usr/include/time.h >/dev/null 2>&1 ; then
! 	echo 'tzname found in time.h'
! 	d_tzname="$define"
      fi
  fi
  : check for valid reply/to fields
  case "$d_useembed" in
  "$define")	dflt=y;;
--- 3985,4007 ----
      echo "You have timezone defined in $timeincl rather than tz_minuteswest."
      d_tz_min="$undef"
  fi
  
  #	try alternate test for nm commands that have problems
  #	with data items being parsed
  
! 
! if Cppsym ultrix ; then
!     echo "running Ultrix, will not test for tzname in $timeincl"
! else
!     if $test "$d_tzname" = "$undef"; then
! 	if $contains tzname try.c >/dev/null 2>&1 ; then
! 	    echo "tzname found in $timeincl"
! 	    d_tzname="$define"
! 	fi
      fi
  fi
+ 
+ $rm -f try.c
  : check for valid reply/to fields
  case "$d_useembed" in
  "$define")	dflt=y;;
***************
*** 3994,4005 ****
   
  One of the more annoying quirks of the UUCP network and various other
  systems that interact with it are that everyone seems to have different
! ideas about how to do routing, etc.  Therefore, a lot of times email
! will arrive from offsite with corrupt, unreply-able "Reply-To:" and
! "From:" fields.  This next question relates to whether your site is
! liable to get mangled fields or not...
  
! Does your site receive email with valid "Reply-To:" and "From:" fields?
  
  EOM
  $echo $n "Use Reply-To: and From: addresses? [$dflt] $c"
--- 4017,4028 ----
   
  One of the more annoying quirks of the UUCP network and various other
  systems that interact with it are that everyone seems to have different
! ideas about how to do routing, etc.  Therefore, a lot of times e-mail
! will arrive from off site with corrupt, unusable "Reply-To:" and "From:"
! fields.  This next question relates to whether your site is liable to
! get mangled fields or not...
  
! Does your site receive e-mail with valid "Reply-To:" and "From:" fields?
  
  EOM
  $echo $n "Use Reply-To: and From: addresses? [$dflt] $c"
***************
*** 4091,4097 ****
  #include <fcntl.h>
  #include <sys/types.h>
  #include <sys/stat.h>
! #define far /* to keep XENIX from complaining */
  #if (defined(BSD) || !defined(apollo))
  #  include <sys/file.h>
  #endif
--- 4114,4120 ----
  #include <fcntl.h>
  #include <sys/types.h>
  #include <sys/stat.h>
! #define far /* to keep Xenix from complaining */
  #if (defined(BSD) || !defined(apollo))
  #  include <sys/file.h>
  #endif
***************
*** 4199,4205 ****
      echo "I'm assuming they return void like ANSI and POSIX want."
      echo "If not, you will have to change sigtype to match the typedef"
      echo "used by the signal handlers.  Change it config.sh at the edit "
!     echo "question at the end of Configure"
      sigtype="void"
  fi
  rm -f $$.tmp
--- 4222,4228 ----
      echo "I'm assuming they return void like ANSI and POSIX want."
      echo "If not, you will have to change sigtype to match the typedef"
      echo "used by the signal handlers.  Change it config.sh at the edit "
!     echo "question at the end of Configure."
      sigtype="void"
  fi
  rm -f $$.tmp
***************
*** 4345,4352 ****
  $cat <<EOM
  
  Elm has an option to send messages to the printer.  This question
! asks for the default spooler name.  You can also specify options
! to the command by separating them from the command by at least one space. 
  
  EOM
  cont=true
--- 4368,4375 ----
  $cat <<EOM
  
  Elm has an option to send messages to the printer.  This question
! asks for the default spooler name.  You can also specify options to
! the command by separating them from the command by at least one space. 
  
  EOM
  cont=true
***************
*** 4376,4382 ****
  	;;
      *)
          if $test "$fastread" = yes; then
! 	    echo "The print spooler needs to a full path name, using current possibly improper value"
  	    cont=''
  	else
  	    echo "Please give the full path name."
--- 4399,4406 ----
  	;;
      *)
          if $test "$fastread" = yes; then
! 	    echo "The print spooler needs to be a full path name."
! 	    echo "Using the current, possibly improper, value."
  	    cont=''
  	else
  	    echo "Please give the full path name."

Index: MANIFEST
*** ../elm2.4/MANIFEST	Tue Nov 17 14:10:55 1992
--- MANIFEST	Sun Dec 20 00:16:27 1992
***************
*** 79,84 ****
--- 79,85 ----
  lib/Makefile.SH
  lib/add_site.c
  lib/addrmchusr.c
+ lib/aliasdb.c
  lib/can_access.c
  lib/can_open.c
  lib/chloc.c

Index: NOTICE
*** ../elm2.4/NOTICE	Sat Oct  3 18:12:33 1992
--- NOTICE	Sun Dec 20 00:19:11 1992
***************
*** 44,51 ****
             without warrantee or guarantee of any nature, express or implied, 
             nor is there any fitness for use represented.
  
! Software is a malleable thing - especially Unix - and the authors can in no
! way guarantee that using this program will not cause grevious damage to your
  system.  Of course this isn't anticipated, but if it does happen, the authors
  cannot be held liable for any damages either directly or indirectly caused
  by this event.
--- 44,51 ----
             without warrantee or guarantee of any nature, express or implied, 
             nor is there any fitness for use represented.
  
! Software is a malleable thing - especially UNIX - and the authors can in no
! way guarantee that using this program will not cause grievous damage to your
  system.  Of course this isn't anticipated, but if it does happen, the authors
  cannot be held liable for any damages either directly or indirectly caused
  by this event.

Index: Overview
*** ../elm2.4/Overview	Sat Oct  3 18:12:34 1992
--- Overview	Sun Dec 20 00:19:12 1992
***************
*** 8,15 ****
  
  1. What is Elm?
  
! 	Currently on Unix, there seems to be a preponderence of line-oriented 
! software.  This is most unfortunate as most of the software on Unix tends to
  be pretty darn hard to use!  I believe that there is more than a slight
  correlation between the two, and, since I was myself having problems using
  "mailx" with high-volume mail, I created a new mail system.
--- 8,15 ----
  
  1. What is Elm?
  
! 	Currently on UNIX, there seems to be a preponderance of line-oriented 
! software.  This is most unfortunate as most of the software on UNIX tends to
  be pretty darn hard to use!  I believe that there is more than a slight
  correlation between the two, and, since I was myself having problems using
  "mailx" with high-volume mail, I created a new mail system.
***************
*** 42,48 ****
  
  	The Elm development group uses almost every UNIX system out
  there between all of its volunteers.  Elm runs on USL System V, BSD,
! SunOS, Apollo, UTS, Pyramid and Xenix and should run on almost any Unix
  systems without any modifications (if there turn out to be
  modifications, please notify the Elm Development Group as soon as
  possible).
--- 42,48 ----
  
  	The Elm development group uses almost every UNIX system out
  there between all of its volunteers.  Elm runs on USL System V, BSD,
! SunOS, Apollo, UTS, Pyramid and Xenix and should run on almost any UNIX
  systems without any modifications (if there turn out to be
  modifications, please notify the Elm Development Group as soon as
  possible).
***************
*** 64,70 ****
  	   assuming I'm on a teletype.
  
  	- To have a mailer that was 100% correct when dealing with	 
! 	  network mail (ie RFC-822).
  
  	- To create a system that needed no documentation for the
  	  casual user, but was still powerful enough and sophisticated
--- 64,70 ----
  	   assuming I'm on a teletype.
  
  	- To have a mailer that was 100% correct when dealing with	 
! 	  network mail (i.e. RFC-822).
  
  	- To create a system that needed no documentation for the
  	  casual user, but was still powerful enough and sophisticated

Index: Patchlist
*** ../elm2.4/Patchlist	Thu Dec 24 18:56:32 1992
--- Patchlist	Thu Dec 24 18:54:02 1992
***************
*** 1,4 ****
--- 1,57 ----
  =========================================================
+ Patch Set - Patches 18 through 19: Thu Dec 24 18:53:52 EST 1992
+ Elm 2.4PL17 -> Elm 2.4PL19
+ 
+ Fix unintended change where forwarding without editing started adding
+ prefix chars
+ From: Syd
+ 
+ Here are the doc changes for my additions to the alias system and
+ the new switches to listalias.
+ From: "Robert L. Howard" <robert.howard@matd.gatech.edu>
+ 
+ Add a c)hange alias, -u and -t options to listalias to list only user
+ and only system aliases respectively.
+ From: "Robert L. Howard" <robert.howard@matd.gatech.edu>
+ 
+ Fix formatting and typograpical problems
+ From: dwolfe@pffft.sps.mot.com (Dave Wolfe)
+ 
+ Always pass three parameters to header_cmp().
+ From: chip@tct.com (Chip Salzenberg)
+ 
+ Fixed where when doing ! or | and ti/te is enabled, one doesn't see the
+ "Press any key to return to ELM:" message. because the screens are
+ switched before the message is printed.
+ From: Jan Djarv <Jan.Djarv@sa.erisoft.se>
+ 
+ Quote from the filter of phrase to prevent RFC-822 parsing problems
+ From: Syd via request from Ian Stewartson <istewart@dlvax2.datlog.co.uk>
+ 
+ EDITOROPTS and DEFEDITOR appear to be unused but here is 
+ a patch to make use of $editoropts.
+ From: "Robert L. Howard" <robert.howard@matd.gatech.edu>
+ 
+ Fix confirm prompts to follow Elm style in confirm append/create
+ From: Syd
+ 
+ Fix messages and nls messages to match.  Plus use want_to
+ where appropriate.
+ From: Syd, via prompting from Jan Djarv <Jan.Djarv@sa.erisoft.se>
+ 
+ Add Ignore of CONT signals on exit for Ultrix
+ From: Syd via prompt from Bob Mason
+ 
+ Add lstat call for proper detection of symlink in leavembox.c
+ From: Syd via prompt from Bryan Curnutt
+ 
+ Make copy_sans_escape expand tabs to prevent subject displays from getting messed up
+ From: Syd via request from pgf@Cayman.COM (Paul Fox)
+ 
+ 
+ 
+ 
+ =========================================================
  Patch Set - Patches 13 through 17: Fri Dec 11 20:52:23 EST 1992
  Elm 2.4PL13 -> Elm 2.4PL17
  
***************
*** 29,35 ****
  
  Traditional C used 'unsigned preserving' rules when an integral data
  value is widened to integer and ANSI C changed the rules to 'value
! preserving'. This is one of the few things that the ANSI X3J11 comitte
  did that might break existing programs.  Casting to (int)
  From: Bo.Asbjorn.Muldbak <bam@jutland.ColumbiaSC.NCR.COM>
  
--- 82,88 ----
  
  Traditional C used 'unsigned preserving' rules when an integral data
  value is widened to integer and ANSI C changed the rules to 'value
! preserving'. This is one of the few things that the ANSI X3J11 committee
  did that might break existing programs.  Casting to (int)
  From: Bo.Asbjorn.Muldbak <bam@jutland.ColumbiaSC.NCR.COM>
  
***************
*** 53,59 ****
  Attempt to patch posix_signal for SunOS problem.
  From: A lot of the Elm group
  
! Change cancelled mail message to indicate full path name as
  AFS users don't have home and elm's home the same.
  From: Syd
  
--- 106,112 ----
  Attempt to patch posix_signal for SunOS problem.
  From: A lot of the Elm group
  
! Change canceled mail message to indicate full path name as
  AFS users don't have home and elm's home the same.
  From: Syd
  
***************
*** 198,204 ****
  There's an error in two messages in s_aliases.m which causes elm2.4
  to core dump when resyncronize aliases. (%s/%s) should be (%c/%c).
  
! This bug doesn't show up unless you use message cataloges, since the default
  message in a_quit.c is correct.
  From: Jan Djarv <Jan.Djarv@sa.erisoft.se>
  
--- 251,257 ----
  There's an error in two messages in s_aliases.m which causes elm2.4
  to core dump when resyncronize aliases. (%s/%s) should be (%c/%c).
  
! This bug doesn't show up unless you use message catalogs, since the default
  message in a_quit.c is correct.
  From: Jan Djarv <Jan.Djarv@sa.erisoft.se>
  
***************
*** 395,401 ****
  to have an ego problem.  The various guides are just fine.
  From: Steve Simmons <scs@wotan.iti.org>
  
! setting the debuglevel to 5 or higher caused a coredump due to a possible
  dereference of a NULL pointer
  From: "Peter A. Bigot" <pab@cs.arizona.edu>
  
--- 448,454 ----
  to have an ego problem.  The various guides are just fine.
  From: Steve Simmons <scs@wotan.iti.org>
  
! setting the debug level to 5 or higher caused a core dump due to a possible
  dereference of a NULL pointer
  From: "Peter A. Bigot" <pab@cs.arizona.edu>
  
***************
*** 413,419 ****
  TEXT_SORT was supported, but UNRECOGNIZED
  From: ls@dmicvx.dmi.min.dk  (Lennart Sorth)
  
! Force text arithimetic into unsigned for those systems
  with signed chars
  From: Marius Olafsson <marius@rhi.hi.is>
  
--- 466,472 ----
  TEXT_SORT was supported, but UNRECOGNIZED
  From: ls@dmicvx.dmi.min.dk  (Lennart Sorth)
  
! Force text arithmetic into unsigned for those systems
  with signed chars
  From: Marius Olafsson <marius@rhi.hi.is>
  
***************
*** 498,503 ****
  From: dax@ulysse.enst.fr (Philippe Dax)
  
  change dbm name to dbz to avoid conflicts with partial call
! ins from shared librarys, and from mixing code with yp code.
  From: Syd via prompt from Jess Anderson
  
--- 551,556 ----
  From: dax@ulysse.enst.fr (Philippe Dax)
  
  change dbm name to dbz to avoid conflicts with partial call
! ins from shared libraries, and from mixing code with yp code.
  From: Syd via prompt from Jess Anderson
  

Index: README
*** ../elm2.4/README	Thu Dec 24 18:56:32 1992
--- README	Sun Dec 20 00:19:11 1992
***************
*** 4,10 ****
  
  It is IMPERATIVE that all users rerun newalias after installing
  Elm 2.4 when upgrading from a previous version.  Elm's behavior
! with aliases could be unpredictible if this step is not performed.
  
  Where to find more info on Elm:
     Much discussion on Elm including interim bug fixes, work arounds
--- 4,10 ----
  
  It is IMPERATIVE that all users rerun newalias after installing
  Elm 2.4 when upgrading from a previous version.  Elm's behavior
! with aliases could be unpredictable if this step is not performed.
  
  Where to find more info on Elm:
     Much discussion on Elm including interim bug fixes, work arounds
***************
*** 11,17 ****
  and future plans occurs in the Usenet news group comp.mail.elm.  Also
  a monthly status report on Elm is posted there.  This status report
  lists the archive sites that have the patches to Elm as well as the
! lastest version.
  
  Patches to Elm are posted to comp.mail.elm and comp.sources.bugs as
  soon as they are released.  They are posted to comp.sources.unix shortly
--- 11,17 ----
  and future plans occurs in the Usenet news group comp.mail.elm.  Also
  a monthly status report on Elm is posted there.  This status report
  lists the archive sites that have the patches to Elm as well as the
! latest version.
  
  Patches to Elm are posted to comp.mail.elm and comp.sources.bugs as
  soon as they are released.  They are posted to comp.sources.unix shortly
***************
*** 55,61 ****
  	If you run a nonstandard configuration of Mail, such as Xenix
  running smail, Configure can get confused as to where to place items.
  Be sure and check the config.sh file for the correct placement before
! continuning.  If changes are necessary, rerun Configure and fix the
  file before exiting.
  
  	On SCO Xenix, if you are all mail is from user anonymous,
--- 55,61 ----
  	If you run a nonstandard configuration of Mail, such as Xenix
  running smail, Configure can get confused as to where to place items.
  Be sure and check the config.sh file for the correct placement before
! continuing.  If changes are necessary, rerun Configure and fix the
  file before exiting.
  
  	On SCO Xenix, if you are all mail is from user anonymous,
***************
*** 90,96 ****
  question.  No other changes are needed.
  
  	On IBM RISC 6000 AIX, prior to 3.2, you might get string
! funtion errors on the compile.  The solution is to do the following:
  > Look at /usr/lpp/bos/bsdsport. It tells you
  > to add following lines to /etc/xlc.cfg
  >  
--- 90,96 ----
  question.  No other changes are needed.
  
  	On IBM RISC 6000 AIX, prior to 3.2, you might get string
! function errors on the compile.  The solution is to do the following:
  > Look at /usr/lpp/bos/bsdsport. It tells you
  > to add following lines to /etc/xlc.cfg
  >  
***************
*** 176,182 ****
  > 
  > # rm /bin/sh.rm
  > 
! > That way you preserve your old shell, ( ie you don't break it ), but you
  > get to use Configure without bus errors etc.
  > 
  > I hope that of use
--- 176,182 ----
  > 
  > # rm /bin/sh.rm
  > 
! > That way you preserve your old shell, ( i.e. you don't break it ), but you
  > get to use Configure without bus errors etc.
  > 
  > I hope that of use
***************
*** 251,265 ****
  
  
    On some systems (at least MIPS RiscOs 4.52, and CDC EP/IX 1.4.x) there
! is an stdlib.h with Ansi Constructs, but the normally supplied Compiler
! did not handle Ansi-C. If you use the bundled compiler (cc2.11 or cc2.20),
  you should edit config.h after configuring, and remove the define for 
! I_STDLIB. With gcc or the separate Ansi C Compiler there should be no problem.
  
  On many systems with the Microsoft UNIX C Compilers (such as SCO), compiling
  with optimization breaks the code.  One symptom is that aliases do not work.
  On those machines do not compile any of Elm with optimizations.
! To accomplish that, set all occurences of "OPTIMZE" in the makefiles to
  "-Od" - then it works.  From: mrbulli@btoy1.UUCP (Thomas Bullinger)
  
  					Syd Weinstein
--- 251,265 ----
  
  
    On some systems (at least MIPS RiscOs 4.52, and CDC EP/IX 1.4.x) there
! is an stdlib.h with ANSI Constructs, but the normally supplied Compiler
! did not handle ANSI-C. If you use the bundled compiler (cc2.11 or cc2.20),
  you should edit config.h after configuring, and remove the define for 
! I_STDLIB. With gcc or the separate ANSI C Compiler there should be no problem.
  
  On many systems with the Microsoft UNIX C Compilers (such as SCO), compiling
  with optimization breaks the code.  One symptom is that aliases do not work.
  On those machines do not compile any of Elm with optimizations.
! To accomplish that, set all occurrences of "OPTIMIZE" in the makefiles to
  "-Od" - then it works.  From: mrbulli@btoy1.UUCP (Thomas Bullinger)
  
  					Syd Weinstein

Index: config.h.SH
*** ../elm2.4/config.h.SH	Thu Dec 24 18:56:32 1992
--- config.h.SH	Thu Dec 24 18:50:21 1992
***************
*** 114,120 ****
  
  /* ASCII_CTYPE:
   *	This symbol, if defined, indicates that the ctype functions and
!  *	macros are ascii specific and not 8 bit clean.
   */
  #$d_ascii	ASCII_CTYPE	/**/
  
--- 114,120 ----
  
  /* ASCII_CTYPE:
   *	This symbol, if defined, indicates that the ctype functions and
!  *	macros are ASCII specific and not 8-bit clean.
   */
  #$d_ascii	ASCII_CTYPE	/**/
  
***************
*** 285,291 ****
  
  /* MIME:
   *	This symbol, if defined, indicates that the MIME mail
!  *	extension utilities are acailable
   */
  #$d_mime	MIME	/**/
  
--- 285,291 ----
  
  /* MIME:
   *	This symbol, if defined, indicates that the MIME mail
!  *	extension utilities are available
   */
  #$d_mime	MIME	/**/
  
***************
*** 302,308 ****
  #$d_newauto AUTO_BACKGROUND /**/
  
  /* DONT_ADD_FROM:
!  *	This symbol, if defined, indicates that elm should not adD
   *	the From: header
   */
  /* USE_DOMAIN:
--- 302,308 ----
  #$d_newauto AUTO_BACKGROUND /**/
  
  /* DONT_ADD_FROM:
!  *	This symbol, if defined, indicates that elm should not add
   *	the From: header
   */
  /* USE_DOMAIN:
***************
*** 473,483 ****
   *	This symbol is defined if this system uses tz_minutes west
   *	in time.h instead of timezone.  Only for BSD Systems
   */
- #$d_tz_min	TZ_MINUTESWEST 	/**/
- 
  /* TZNAME:
   *	This symbol, if defined, indicates that extern char *tzname[] exists.
   */
  #$d_tzname	TZNAME	/**/
  
  /* USE_EMBEDDED_ADDRESSES:
--- 473,483 ----
   *	This symbol is defined if this system uses tz_minutes west
   *	in time.h instead of timezone.  Only for BSD Systems
   */
  /* TZNAME:
   *	This symbol, if defined, indicates that extern char *tzname[] exists.
   */
+ #$d_tz_min	TZ_MINUTESWEST 	/**/
+ 
  #$d_tzname	TZNAME	/**/
  
  /* USE_EMBEDDED_ADDRESSES:
***************
*** 566,572 ****
  /* BERKNAMES:
   *	This symbol, if defined, indicates that full names are stored in
   *	the /etc/passwd file in Berkeley format (name first thing, everything
!  *	up to first comma, with & replaced by capitalized login id, yuck).
   */
  /* USGNAMES:
   *	This symbol, if defined, indicates that full names are stored in
--- 566,572 ----
  /* BERKNAMES:
   *	This symbol, if defined, indicates that full names are stored in
   *	the /etc/passwd file in Berkeley format (name first thing, everything
!  *	up to first comma, with & replaced by capitalized login ID, yuck).
   */
  /* USGNAMES:
   *	This symbol, if defined, indicates that full names are stored in

Index: doc/Alias.guide
Prereq: 5.2
*** ../elm2.4/doc/Alias.guide	Mon Oct 19 13:04:01 1992
--- doc/Alias.guide	Thu Dec 24 18:48:48 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Alias.guide,v 5.2 1992/10/17 22:01:01 syd Exp $
  .\"
  .\"  A guide to the ELM alias system and so on.
  .\"  format with:
--- 1,4 ----
! .\" @(#)$Id: Alias.guide,v 5.4 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  A guide to the ELM alias system and so on.
  .\"  format with:
***************
*** 11,16 ****
--- 11,25 ----
  .\"	Syd Weinstein		elm@DSI.COM (dsinc!elm)
  .\"
  .\"  $Log: Alias.guide,v $
+ .\" Revision 5.4  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
+ .\" Revision 5.3  1992/12/20  05:06:19  syd
+ .\" Here are the doc changes for my additions to the alias system and
+ .\" the new switches to listalias.
+ .\" From: "Robert L. Howard" <robert.howard@matd.gatech.edu>
+ .\"
  .\" Revision 5.2  1992/10/17  22:01:01  syd
  .\" corrected typos
  .\" From: David.W.Tamkin@gagme.chi.il.us (David W. Tamkin)
***************
*** 59,66 ****
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
--- 68,75 ----
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
***************
*** 116,124 ****
--- 125,135 ----
  
  The simplest type of aliases in the \f3Elm\f1 system are individual
  user aliases.  These are made up of three parts;
+ 
  .nf
  	\f2aliasname list\f1  =  \f2username\f1  =  \f2address\f1
  .fi
+ 
  Where the \f2aliasname list\f1 is either a single aliasname\s-1\u1\d\s0
  .fn
  1. aliasnames can be any combination of letters, numbers, dashes (`-'),
***************
*** 135,145 ****
  or some other permutation.  The
  name can optionally be entered in the format of `Taylor; Dave'.  When
  this is done, the alias system can sort aliases on a last name basis
! for presentation on the alias menu within \f3elm\f1.
  \f3Elm\f1
  uses this information to add the users full name to the addresses of 
  outbound mail to get more readable addresses.  No
! matter which format a name is entered, \f3elm\f1 will display it
  and put it in mail headers the way you would expect (i.e., `Dave Taylor').
  .pg
  \f2Address\f1 is either the users full electronic mail address or, if
--- 146,156 ----
  or some other permutation.  The
  name can optionally be entered in the format of `Taylor; Dave'.  When
  this is done, the alias system can sort aliases on a last name basis
! for presentation on the alias menu within \f3Elm\f1.
  \f3Elm\f1
  uses this information to add the users full name to the addresses of 
  outbound mail to get more readable addresses.  No
! matter which format a name is entered, \f3Elm\f1 will display it
  and put it in mail headers the way you would expect (i.e., `Dave Taylor').
  .pg
  \f2Address\f1 is either the users full electronic mail address or, if
***************
*** 220,226 ****
  to the corresponding fields in user aliases.
  .pg
  The interesting part is the \f2list of people\f1 field; this
! field is actually in the same notation as the aliasname list,
  so it's really quite easy to create.
  It's best to illustrate by example:
  
--- 231,238 ----
  to the corresponding fields in user aliases.
  .pg
  The interesting part is the \f2list of people\f1 field; this
! field is actually in the same notation as the aliasname list (i.e.,
! a list of addresses separated by a single comma),
  so it's really quite easy to create.
  It's best to illustrate by example:
  
***************
*** 255,261 ****
  .in 0
  .fi
  .pg
! Unlike in prior versions of \f3elm\f1, group aliases need not
  be a \f2previously defined alias\f1 or a valid mail address on
  the current machine.  Any valid delivery address, local user, or
  prior local or group alias may now be part of a group alias.
--- 267,273 ----
  .in 0
  .fi
  .pg
! Unlike in prior versions of \f3Elm\f1, group aliases need not
  be a \f2previously defined alias\f1 or a valid mail address on
  the current machine.  Any valid delivery address, local user, or
  prior local or group alias may now be part of a group alias.

Index: doc/Config.guid
Prereq: 5.5
*** ../elm2.4/doc/Config.guid	Thu Dec 24 18:56:32 1992
--- doc/Config.guid	Thu Dec 24 18:48:48 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Config.guid,v 5.5 1992/11/27 02:51:18 syd Exp $
  .\"
  .\"  A guide to the ELM alias system and so on.
  .\"  format with:
--- 1,4 ----
! .\" @(#)$Id: Config.guid,v 5.6 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  A guide to the ELM alias system and so on.
  .\"  format with:
***************
*** 11,16 ****
--- 11,20 ----
  .\"	Syd Weinstein		elm@DSI.COM (dsinc!elm)
  .\"
  .\"  $Log: Config.guid,v $
+ .\" Revision 5.6  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
  .\" Revision 5.5  1992/11/27  02:51:18  syd
  .\" Make the docs catch up with the code, config.changes -> config.over
  .\" From: Syd
***************
*** 69,76 ****
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .ps 10
  .ss 12
  .vs 12
--- 73,80 ----
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .ps 10
  .ss 12
  .vs 12

Index: doc/Elm.cover
Prereq: 5.2
*** ../elm2.4/doc/Elm.cover	Tue Oct 27 11:17:22 1992
--- doc/Elm.cover	Thu Dec 24 18:48:49 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Elm.cover,v 5.2 1992/10/24 14:13:39 syd Exp $
  .\"
  .\"  Cover sheet for the ELM mail system...
  .\"  format with 
--- 1,4 ----
! .\" @(#)$Id: Elm.cover,v 5.3 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  Cover sheet for the ELM mail system...
  .\"  format with 
***************
*** 12,17 ****
--- 12,21 ----
  .\"  (C) Copyright 1988-1992 Usenet Community Trust
  .\"
  .\"  $Log: Elm.cover,v $
+ .\" Revision 5.3  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
  .\" Revision 5.2  1992/10/24  14:13:39  syd
  .\" Add notice file
  .\"
***************
*** 69,76 ****
  Mountain View, California
  email: taylor\s11@\s10intuitive.com \ or \ limbo!taylor
  
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .sp
  .fi
  NOTICE: You may, without additional permission from the authors, distribute 
--- 73,80 ----
  Mountain View, California
  email: taylor\s11@\s10intuitive.com \ or \ limbo!taylor
  
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .sp
  .fi
  NOTICE: You may, without additional permission from the authors, distribute 

Index: doc/Filter.guid
Prereq: 5.2
*** ../elm2.4/doc/Filter.guid	Tue Nov 17 14:10:55 1992
--- doc/Filter.guid	Thu Dec 24 18:48:50 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Filter.guid,v 5.2 1992/11/15 01:41:50 syd Exp $
  .\"
  .\"  A guide to the Elm Filter program
  .\"  format with:
--- 1,4 ----
! .\" @(#)$Id: Filter.guid,v 5.3 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  A guide to the Elm Filter program
  .\"  format with:
***************
*** 12,17 ****
--- 12,21 ----
  .\"	Syd Weinstein		elm@DSI.COM (dsinc!elm)
  .\"
  .\"  $Log: Filter.guid,v $
+ .\" Revision 5.3  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
  .\" Revision 5.2  1992/11/15  01:41:50  syd
  .\" Add regexp processing to filter.
  .\" Add execc operator
***************
*** 60,67 ****
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
--- 64,71 ----
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1

Index: doc/Form.guide
Prereq: 5.2
*** ../elm2.4/doc/Form.guide	Mon Oct 12 23:25:41 1992
--- doc/Form.guide	Thu Dec 24 18:48:51 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Form.guide,v 5.2 1992/10/11 01:33:36 syd Exp $
  .\"
  .\"  A guide to using the Elm Forms mode
  .\"  format with:
--- 1,4 ----
! .\" @(#)$Id: Form.guide,v 5.3 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  A guide to using the Elm Forms mode
  .\"  format with:
***************
*** 12,17 ****
--- 12,21 ----
  .\"  Copyright (c) 1986,1987 Dave Taylor
  .\"
  .\"  $Log: Form.guide,v $
+ .\" Revision 5.3  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
  .\" Revision 5.2  1992/10/11  01:33:36  syd
  .\" fixed a bug in the .lp macro in doc/tmac.n.  The lp macros is always
  .\" called with a unit specified for the second argument, however, the
***************
*** 79,86 ****
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
--- 83,90 ----
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1

Index: doc/Ref.guide
Prereq: 5.13
*** ../elm2.4/doc/Ref.guide	Thu Dec 24 18:56:33 1992
--- doc/Ref.guide	Thu Dec 24 18:48:52 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Ref.guide,v 5.13 1992/12/12 01:27:41 syd Exp $
  .\"
  .\"  Reference guide to the Elm mail system.
  .\"  format with 
--- 1,4 ----
! .\" @(#)$Id: Ref.guide,v 5.16 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  Reference guide to the Elm mail system.
  .\"  format with 
***************
*** 12,17 ****
--- 12,30 ----
  .\"  (C) Copyright 1988-1992 Usenet Community Trust
  .\"
  .\"  $Log: Ref.guide,v $
+ .\" Revision 5.16  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
+ .\" Revision 5.15  1992/12/20  05:22:13  syd
+ .\" Fix formatting and typograpical problems
+ .\" From: dwolfe@pffft.sps.mot.com (Dave Wolfe)
+ .\"
+ .\" Revision 5.14  1992/12/20  05:06:19  syd
+ .\" Here are the doc changes for my additions to the alias system and
+ .\" the new switches to listalias.
+ .\" From: "Robert L. Howard" <robert.howard@matd.gatech.edu>
+ .\"
  .\" Revision 5.13  1992/12/12  01:27:41  syd
  .\" Make verb and pronoun agree.
  .\" From: dwolfe@pffft.sps.mot.com (Dave Wolfe)
***************
*** 123,130 ****
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
--- 136,143 ----
  .sp
  email: elm\s-1@\s+1DSI.COM  or  dsinc\s-1!\s+1elm
  .sp |9.0i
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
***************
*** 582,588 ****
  system temporary directory could cause problems, such as when not all
  NFS clients mount the common temporary directory, or when the temporary
  directory is prone to being cleared periodically.  The default entry
! of the system temporary directory is normally ok.
  
  .lp visualeditor+ 1.0i
  The editor to be used by the ~v escape within the "builtin" editor.
--- 595,601 ----
  system temporary directory could cause problems, such as when not all
  NFS clients mount the common temporary directory, or when the temporary
  directory is prone to being cleared periodically.  The default entry
! of the system temporary directory is normally OK.
  
  .lp visualeditor+ 1.0i
  The editor to be used by the ~v escape within the "builtin" editor.
***************
*** 1202,1213 ****
  of the message. The text lines before, between and after the \f2include\f1
  lines go into extra Message parts of type Text.
  
! As an example, say you want to include the File foo.gif into your message,
! which is a GIF Image, and you want to use base64 encoding, use the
  following line:
  
  .ft CW
  .zf
  [\&include foo.gif image/gif base64]\f1
  
  Or you want to include a text file which contains plain ASCII:
--- 1215,1227 ----
  of the message. The text lines before, between and after the \f2include\f1
  lines go into extra Message parts of type Text.
  
! As an example, say you want to include the file foo.gif into your message,
! which is a GIF Image, and you want to use \f2base64\f1 encoding, use the
  following line:
  
  .ft CW
  .zf
+ .ti .5i
  [\&include foo.gif image/gif base64]\f1
  
  Or you want to include a text file which contains plain ASCII:
***************
*** 1214,1219 ****
--- 1228,1234 ----
  
  .ft CW
  .zf
+ .ti .5i
  [\&include foo.txt text/plain]\f1
  
  The \f2encoding\f1 parameter is optional and the default is 7bit.
***************
*** 1914,1919 ****
--- 1929,1936 ----
  wanted to include a message from Joe, without any headers, prefixed,
  we could use:
  .nf
+ .ft CW
+ .zf
  .ti .5i
  ~m -n Joe
  .fi
***************
*** 1980,1986 ****
  .sp
  .ce 3
  Alias commands:  ?=help, <n>=set current to n, /=search pattern
! a)lias current message, d)elete, e)dit aliases.text, f)ully expand alias,
  l)imit display, m)ail, n)ew alias, r)eturn, t)ag, u)ndelete, or e(x)it
  .sp
  Alias: @
--- 1997,2003 ----
  .sp
  .ce 3
  Alias commands:  ?=help, <n>=set current to n, /=search pattern
! a)lias current message, c)hange, d)elete, e)dit aliases.text, f)ully expand,
  l)imit display, m)ail, n)ew alias, r)eturn, t)ag, u)ndelete, or e(x)it
  .sp
  Alias: @
***************
*** 2024,2032 ****
  Alias current message.  
  This allows the user to create an alias that has the
  return address of the current message as the address field of
! the alias.  It prompts for a unique alias name.  For further 
  information, please see \f2The Elm Alias System Users Guide\f1.
  
  .lp "\h'16p'd, u" .5i
  Delete or undelete an alias.
  This allows the user to mark an alias for deletion in the same fashion
--- 2041,2059 ----
  Alias current message.  
  This allows the user to create an alias that has the
  return address of the current message as the address field of
! the alias.  It prompts for a unique alias name.  If the alias
! name is not unique, you will be asked if you wish to replace
! the existing alias.  For further 
  information, please see \f2The Elm Alias System Users Guide\f1.
  
+ .lp \h'16p'c .5i
+ Change current user alias.  This will prompt for changes to the current
+ names and address.  If other aliases are tagged you will be asked if you
+ want to create a group alias from the tagged aliases.  The original
+ alias will be replaced with the new information in
+ your individual aliases.text file (\f2$HOME/.elm/aliases.text\f1) and 
+ then added to the database (upon the next alias resync).
+ 
  .lp "\h'16p'd, u" .5i
  Delete or undelete an alias.
  This allows the user to mark an alias for deletion in the same fashion
***************
*** 2060,2066 ****
  
  .lp \h'16p'n .5i
  Make a new user alias.  This will prompt for a unique alias name and
! then for an address.  If aliases are tagged you will be asked if you
  want to create a group alias from the tagged aliases.
  The information provided will be added
  to your individual aliases.text file (\f2$HOME/.elm/aliases.text\f1) and 
--- 2087,2095 ----
  
  .lp \h'16p'n .5i
  Make a new user alias.  This will prompt for a unique alias name and
! then for an address.  If the alias
! name is not unique, you will be asked if you wish to replace
! the existing alias.  If aliases are tagged you will be asked if you
  want to create a group alias from the tagged aliases.
  The information provided will be added
  to your individual aliases.text file (\f2$HOME/.elm/aliases.text\f1) and 
***************
*** 2107,2117 ****
  
  In particular, \f2elm\fR watches for the following \f2signals\f1
  and takes these actions:
! .ip \f2ALRM\f1
  This is the alarm clock signal or time warning.
  Elm uses this to wake itself up periodically and check for
  new mail.
! .ip \f2HUP\f1
  This is the hangup notice.
  It means that the terminal/modem/whatever which you have been using
  with \f2elm\f1 has become detached from the system where \f2elm\f1
--- 2136,2146 ----
  
  In particular, \f2elm\fR watches for the following \f2signals\f1
  and takes these actions:
! .lp \f2ALRM\f1 .5i
  This is the alarm clock signal or time warning.
  Elm uses this to wake itself up periodically and check for
  new mail.
! .lp \f2HUP\f1 .5i
  This is the hangup notice.
  It means that the terminal/modem/whatever which you have been using
  with \f2elm\f1 has become detached from the system where \f2elm\f1
***************
*** 2118,2137 ****
  was running.
  When \f2elm\f1 gets this signal, it aborts all the pending operations
  and exits leaving your mailbox unchanged.
! .ip \f2USR1\f1
  This is the first user-definable signal.
! When \f2elm\f1 gets this signal, it recieves any pending mail,
  performs all the pending operations (deletes), and exits
  leaving all unread mail marked as new.
  This is the same as giving the \f2$\f1 and \f2X\fR commands.
! .ip \f2USR2\f1
  This is the second user-definable signal.
! When \f2elm\f1 gets this signal, it recieves any pending mail,
  performs all the pending operations (deletes), and exits
  leaving all unread mail marked as old.
  This is the same as giving the \f2$\f1 and \f2Q\fR commands.
! 
! You would only use these signals youself under the most unusual
  circumstances.  For example, suppose you were using \f2elm\fR
  to read mail on \f2host_1\fR.  You have many messages, most of
  which have been read and filed (and therefore deleted), or simply
--- 2147,2167 ----
  was running.
  When \f2elm\f1 gets this signal, it aborts all the pending operations
  and exits leaving your mailbox unchanged.
! .lp \f2USR1\f1 .5i
  This is the first user-definable signal.
! When \f2elm\f1 gets this signal, it receives any pending mail,
  performs all the pending operations (deletes), and exits
  leaving all unread mail marked as new.
  This is the same as giving the \f2$\f1 and \f2X\fR commands.
! .lp \f2USR2\f1 .5i
  This is the second user-definable signal.
! When \f2elm\f1 gets this signal, it receives any pending mail,
  performs all the pending operations (deletes), and exits
  leaving all unread mail marked as old.
  This is the same as giving the \f2$\f1 and \f2Q\fR commands.
! .in 0
! .sp
! You would only use these signals yourself under the most unusual
  circumstances.  For example, suppose you were using \f2elm\fR
  to read mail on \f2host_1\fR.  You have many messages, most of
  which have been read and filed (and therefore deleted), or simply
***************
*** 2146,2154 ****
  description of \f2HUP\f1, \f2USR1\f1 or \f2USR2\f1.
  Use your local \f2ps\f1 command to find out what the \f2process number\f1
  of your \f2elm\f1 session is.  Then give the command
! .pp
! \f2kill -XXX process_number\fR
! 
  where \f2XXX\f1 is either \f2HUP\f1, \f2USR1\f1 or \f2USR2\f1 and
  \f2process_number\f1 is the process number for your remote \f2elm\f1 session.
  Your remote session will terminate with the actions noted above.
--- 2176,2187 ----
  description of \f2HUP\f1, \f2USR1\f1 or \f2USR2\f1.
  Use your local \f2ps\f1 command to find out what the \f2process number\f1
  of your \f2elm\f1 session is.  Then give the command
! .nf
! .ft CW
! .zf
! .ti .5i
! kill -XXX process_number
! .fi
  where \f2XXX\f1 is either \f2HUP\f1, \f2USR1\f1 or \f2USR2\f1 and
  \f2process_number\f1 is the process number for your remote \f2elm\f1 session.
  Your remote session will terminate with the actions noted above.

Index: doc/Users.guide
Prereq: 5.4
*** ../elm2.4/doc/Users.guide	Thu Dec 24 18:56:33 1992
--- doc/Users.guide	Thu Dec 24 18:48:53 1992
***************
*** 1,4 ****
! .\" @(#)$Id: Users.guide,v 5.4 1992/12/11 02:01:13 syd Exp $
  .\"
  .\"  Users guide to the ELM mail system.
  .\"  format with:
--- 1,4 ----
! .\" @(#)$Id: Users.guide,v 5.5 1992/12/24 23:48:05 syd Exp $
  .\"
  .\"  Users guide to the ELM mail system.
  .\"  format with:
***************
*** 12,17 ****
--- 12,21 ----
  .\"  (C) Copyright 1988-1992 Usenet Community Trust
  .\"
  .\"  $Log: Users.guide,v $
+ .\" Revision 5.5  1992/12/24  23:48:05  syd
+ .\" make Nroff not use co symbol, just the word
+ .\" From: Syd via request from Tim Pierce
+ .\"
  .\" Revision 5.4  1992/12/11  02:01:13  syd
  .\" fix Obvious typos.
  .\" From: dwolfe@pffft.sps.mot.com (Dave Wolfe)
***************
*** 117,124 ****
  .ps 12
  .ss 14
  .vs 14
! \s18\f3\(co\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\(co\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1
--- 121,128 ----
  .ps 12
  .ss 14
  .vs 14
! \s18\f3\*(ct\f1\s12 Copyright 1986,1987 by Dave Taylor
! \s18\f3\*(ct\f1\s12 Copyright 1988-1992 by The USENET Community Trust
  .fi
  .ad
  .bp 1

Index: src/a_screen.c
Prereq: 5.1
*** ../elm2.4/src/a_screen.c	Sat Oct  3 18:58:42 1992
--- src/a_screen.c	Sun Dec 20 00:16:00 1992
***************
*** 1,8 ****
  
! static char rcsid[] = "@(#)$Id: a_screen.c,v 5.1 1992/10/03 22:58:40 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 5.1 $   $State: Exp $
   *
   * 			Copyright (c) 1988-1992 USENET Community Trust
   * 			Copyright (c) 1986,1987 Dave Taylor
--- 1,8 ----
  
! static char rcsid[] = "@(#)$Id: a_screen.c,v 5.2 1992/12/20 05:15:58 syd Exp $";
  
  /*******************************************************************************
!  *  The Elm Mail System  -  $Revision: 5.2 $   $State: Exp $
   *
   * 			Copyright (c) 1988-1992 USENET Community Trust
   * 			Copyright (c) 1986,1987 Dave Taylor
***************
*** 14,19 ****
--- 14,24 ----
   *
   *******************************************************************************
   * $Log: a_screen.c,v $
+  * Revision 5.2  1992/12/20  05:15:58  syd
+  * Add a c)hange alias, -u and -t options to listalias to list only user
+  * and only system aliases respectively.
+  * From: "Robert L. Howard" <robert.howard@matd.gatech.edu>
+  *
   * Revision 5.1  1992/10/03  22:58:40  syd
   * Initial checkin as of 2.4 Release at PL0
   *
***************
*** 84,90 ****
  	  Centerline(LINES-6, catgets(elm_msg_cat, AliasesSet, AliasesRMenuLn2,
  "a)lias current message, n)ew alias, d)elete or u)ndelete an alias,"));
  	  Centerline(LINES-5, catgets(elm_msg_cat, AliasesSet, AliasesRMenuLn3,
! "or r)eturn to main menu.  To view an alias, press <return>."));
  	  Centerline(LINES-4, catgets(elm_msg_cat, AliasesSet, AliasesRMenuLn4,
  "j = move down, k = move up, ? = help"));
  	}
--- 89,95 ----
  	  Centerline(LINES-6, catgets(elm_msg_cat, AliasesSet, AliasesRMenuLn2,
  "a)lias current message, n)ew alias, d)elete or u)ndelete an alias,"));
  	  Centerline(LINES-5, catgets(elm_msg_cat, AliasesSet, AliasesRMenuLn3,
! "m)ail to alias, or r)eturn to main menu.  To view an alias, press <return>."));
  	  Centerline(LINES-4, catgets(elm_msg_cat, AliasesSet, AliasesRMenuLn4,
  "j = move down, k = move up, ? = help"));
  	}
***************
*** 92,98 ****
  	    Centerline(LINES-7, catgets(elm_msg_cat, AliasesSet, AliasesMenuLn1,
  "Alias commands:  ?=help, <n>=set current to n, /=search pattern"));
  	    Centerline(LINES-6, catgets(elm_msg_cat, AliasesSet, AliasesMenuLn2,
! "a)lias current message, d)elete, e)dit aliases.text, f)ully expand alias,"));
  	    Centerline(LINES-5, catgets(elm_msg_cat, AliasesSet, AliasesMenuLn3,
  "l)imit display, m)ail, n)ew alias, r)eturn, t)ag, u)ndelete, or e(x)it"));
  	}
--- 97,103 ----
  	    Centerline(LINES-7, catgets(elm_msg_cat, AliasesSet, AliasesMenuLn1,
  "Alias commands:  ?=help, <n>=set current to n, /=search pattern"));
  	    Centerline(LINES-6, catgets(elm_msg_cat, AliasesSet, AliasesMenuLn2,
! "a)lias current message, c)hange, d)elete, e)dit aliases.text, f)ully expand,"));
  	    Centerline(LINES-5, catgets(elm_msg_cat, AliasesSet, AliasesMenuLn3,
  "l)imit display, m)ail, n)ew alias, r)eturn, t)ag, u)ndelete, or e(x)it"));
  	}

Index: src/Makefile.SH
Prereq: 5.1
*** ../elm2.4/src/Makefile.SH	Sat Oct  3 18:58:40 1992
--- src/Makefile.SH	Thu Dec 24 16:42:05 1992
***************
*** 36,41 ****
--- 36,44 ----
  # Revision 5.1  1992/10/03  22:58:40  syd
  # Initial checkin as of 2.4 Release at PL0
  #
+ # Revision 5.1  1992/10/03  22:58:40  syd
+ # Initial checkin as of 2.4 Release at PL0
+ #
  # 
  #
  # Variables

-- 
========================================================================
Sydney S. Weinstein, CDP, CCP          Elm Coordinator - Current 2.4PL20
Datacomp Systems, Inc.                 Projected 3.0 Release: ??? ?,1994
syd@DSI.COM or dsinc!syd      Voice: (215) 947-9900, FAX: (215) 938-0235