Merge local changes to ee(1) into contrib space.

The source file, manual page and English translation are now directly
obtained from the contrib/ directory. This makes it a lot easier to
merge a newer version of ee(1) into the tree.

Thanks to:	des and jhb

1 files changed, 7 insertions, 6 deletions

diff --git a/contrib/ee/ee.msg b/contrib/ee/ee.msg
index f7c209c..4b8cc34 100644
--- a/contrib/ee/ee.msg
+++ b/contrib/ee/ee.msg
@@ -4,6 +4,7 @@ $
 $ For ee patchlevel 3
 $ 
 $ $Header: /home/hugh/sources/old_ae/RCS/ee.msg,v 1.8 1996/11/30 03:23:40 hugh Exp $
+$ $FreeBSD$
 $ 
 $ 
 $set 1
@@ -51,7 +52,7 @@ $quote "
 41 "^f undelete char        ^n next page            ^x search                  "
 42 "^g begin of line        ^o end of line          ^y delete line             "
 43 "^h backspace            ^p prev page            ^z undelete line           "
-44 "^[ (escape) menu                                                           "
+44 "^[ (escape) menu        ESC-Enter: exit ee                                 "
 45 "                                                                           "
 46 "Commands:                                                                  "
 47 "help    : get this info                 file    : print file name          "
@@ -68,7 +69,7 @@ $quote "
 58 "^a ascii code     ^x search         ^z undelete line  ^d down   ^n next page  "
 59 "^b bottom of text ^g begin of line  ^w delete word    ^l left                 "
 60 "^t top of text    ^o end of line    ^v undelete word  ^r right                "
-61 "^c command        ^k delete char    ^f undelete char                          "
+61 "^c command        ^k delete char    ^f undelete char      ESC-Enter: exit ee  "
 62 "help : get help info  |file  : print file name         |line : print line # "
 63 "read : read a file    |char  : ascii code of char      |0-9 : go to line \"#\""
 64 "write: write a file   |case  : case sensitive search   |exit : leave and save "
@@ -110,7 +111,7 @@ $quote "
 100 "           ...searching"
 101 "string \"%s\" not found"
 102 "search for: "
-103 "could not exec %s\n"
+103 "could not exec %s"
 104 "press return to continue "
 105 "press Esc to cancel"
 106 "menu too large for window"
@@ -154,8 +155,8 @@ $quote "
 144 "NOEIGHTBIT"
 145 "emacs key bindings   "
 146 "^a beginning of line    ^i tab                  ^r restore word            "
-147 "^b back 1 char          ^j undel char           ^t top of text             "
-148 "^c command              ^k delete line          ^u bottom of text          "
+147 "^b back 1 char          ^j undel char           ^t begin of file           "
+148 "^c command              ^k delete line          ^u end of file             "
 149 "^d delete char          ^l undelete line        ^v next page               "
 150 "^e end of line          ^m newline              ^w delete word             "
 151 "^f forward 1 char       ^n next line            ^x search                  "
@@ -164,7 +165,7 @@ $quote "
 154 "^[ (escape) menu  ^y search prompt  ^k delete line   ^p prev li   ^g prev page"
 155 "^o ascii code     ^x search         ^l undelete line ^n next li   ^v next page"
 156 "^u end of file    ^a begin of line  ^w delete word   ^b back 1 char           "
-157 "^t top of text    ^e end of line    ^r restore word  ^f forward 1 char        "
+157 "^t begin of file  ^e end of line    ^r restore word  ^f forward 1 char        "
 158 "^c command        ^d delete char    ^j undelete char ^z next word              "
 159 "EMACS"
 160 "NOEMACS"