*** empty log message ***

5 files changed, 24 insertions, 13 deletions

diff --git a/src/config.in b/src/config.in
index f4d53973939..be3cc0dbda5 100644
--- a/src/config.in
+++ b/src/config.in
@@ -95,14 +95,14 @@ and this notice must be preserved on all copies.  */
 
 /* The configuration script links system.h to a s- file that describes
    the system type you are using.
-   See the file ../share-lib/MACHINES for a list of systems and
+   See the file ../etc/MACHINES for a list of systems and
    the names of the s- files to use for them.
    See s-template.h for documentation on writing s- files.  */
 #include "@opsystem@"
 
 /* The configuration script links machine.h to a m- file that
    describes the machine and system you use.
-   See the file ../share-lib/MACHINES for a list of machines and
+   See the file ../etc/MACHINES for a list of machines and
    the names of the m- files to use for them.
    See m-template.h for info on what m- files should define.  */
 #include "@machine@"
diff --git a/src/doc.c b/src/doc.c
index a907118c9ea..48f6c4df685 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -102,8 +102,8 @@ get_doc_string (filepos)
 }
 
 DEFUN ("documentation", Fdocumentation, Sdocumentation, 1, 2, 0,
-  "Return the documentation string of FUNCTION.
-Unless a non-nil second argument is given, the
+  "Return the documentation string of FUNCTION.\n\
+Unless a non-nil second argument is given, the\n\
 string is passed through `substitute-command-keys'.")
   (fun1, raw)
      Lisp_Object fun1, raw;
@@ -182,7 +182,7 @@ subcommands.)");
 DEFUN ("documentation-property", Fdocumentation_property, Sdocumentation_property, 2, 2, 0,
   "Return the documentation string that is SYMBOL's PROP property.\n\
 This is like `get', but it can refer to strings stored in the\n\
-`share-lib/DOC' file; and if the value is a string, it is passed through\n\
+`etc/DOC' file; and if the value is a string, it is passed through\n\
 `substitute-command-keys'.  A non-nil third argument avoids this\n\
 translation.")
   (sym, prop, raw)
@@ -201,10 +201,10 @@ translation.")
 DEFUN ("Snarf-documentation", Fsnarf_documentation, Ssnarf_documentation,
   1, 1, 0,
   "Used during Emacs initialization, before dumping runnable Emacs,\n\
-to find pointers to doc strings stored in `share-lib/DOC...' and\n\
+to find pointers to doc strings stored in `etc/DOC...' and\n\
 record them in function definitions.\n\
 One arg, FILENAME, a string which does not include a directory.\n\
-The file is found in `../share-lib' now; found in the `data-directory'\n\
+The file is found in `../etc' now; found in the `data-directory'\n\
 when doc strings are referred to later in the dumped Emacs.")
   (filename)
      Lisp_Object filename;
@@ -222,7 +222,7 @@ when doc strings are referred to later in the dumped Emacs.")
 
 #ifndef CANNOT_DUMP
   name = (char *) alloca (XSTRING (filename)->size + 14);
-  strcpy (name, "../share-lib/");
+  strcpy (name, "../etc/");
 #else /* CANNOT_DUMP */
   CHECK_STRING (Vdata_directory, 0);
   name = (char *) alloca (XSTRING (filename)->size +
diff --git a/src/eval.c b/src/eval.c
index a030ff8b700..c4fcc808c5d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -624,6 +624,10 @@ Each VALUEFORM can refer to the symbols already bound by this VARLIST.")
       elt = Fcar (varlist);
       if (XTYPE (elt) == Lisp_Symbol)
         specbind (elt, Qnil);
+      else if (! NILP (Fcdr (Fcdr (elt))))
+        Fsignal (Qerror,
+                 Fcons (build_string ("`let' bindings can have only one value-form"),
+                        elt));
       else
         {
           val = Feval (Fcar (Fcdr (elt)));
@@ -668,6 +672,10 @@ All the VALUEFORMs are evalled before any symbols are bound.")
       elt = Fcar (varlist);
       if (XTYPE (elt) == Lisp_Symbol)
         temps [argnum++] = Qnil;
+      else if (! NILP (Fcdr (Fcdr (elt))))
+        Fsignal (Qerror,
+                 Fcons (build_string ("`let' bindings can have only one value-form"),
+                        elt));
       else
         temps [argnum++] = Feval (Fcar (Fcdr (elt)));
       gcpro2.nvars = argnum;
@@ -1499,8 +1507,11 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
           goto done;
 
         default:
-          error ("Ffuncall doesn't handle that number of arguments.");
-          goto done;
+          /* Someone has created a subr that takes more arguments than
+             is supported by this code.  We need to either rewrite the
+             subr to use a different argument protocol, or add more
+             cases to this switch.  */
+          abort ();
         }
     }
   if (XTYPE (fun) == Lisp_Compiled)
diff --git a/src/lread.c b/src/lread.c
index 2a8c47e9559..5a5c106c6e6 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1,5 +1,5 @@
 /* Lisp parsing and input streams.
-   Copyright (C) 1985, 1986, 1987, 1988, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -858,7 +858,7 @@ read1 (readcharfun)
 
         /* If purifying, and string starts with \ newline,
            return zero instead.  This is for doc strings
-           that we are really going to find in share-lib/DOC.nn.nn  */
+           that we are really going to find in etc/DOC.nn.nn  */
         if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
           return make_number (0);
 
diff --git a/src/process.c b/src/process.c
index 018adf1b94e..1bdc27be91b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2794,7 +2794,7 @@ init_process ()
       proc_buffered_char[i] = -1;
     }
 }
-#ifdef 0
+#if 0
 DEFUN ("process-connection", Fprocess_connection, Sprocess_connection, 0, 1, 0,
  "Return the connection type of `PROCESS'.  This can be nil (pipe),\n\
 t or pty (pty) or stream (socket connection).")