Merged from miles@gnu.org--gnu-2005 (patch 307-312)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-307
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-308
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-309
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-310
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-311
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-312
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-346

6 files changed, 96 insertions, 21 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a86f78e5b96..fd11243cbb0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2005-05-14  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (message3): Call cancel_echoing.
+
+        * alloc.c (Fmemory_full_p): New function.
+        (syms_of_alloc): defsubr it.
+
+        * process.c (send_process_trap): Unblock SIGPIPE.
+        (send_process): Reset SIGPIPE handler before reporting error.
+
+2005-05-14  Nick Roberts  <nickrob@snap.net.nz>
+
+        * emacs.c (syms_of_emacs): Fix doc string for system-type.
+
+2005-05-13  Richard M. Stallman  <rms@gnu.org>
+
+        * fileio.c (Ffind_file_name_handler): Handle lambda-exp as handler.
+        (Finsert_file_contents): If we read 0 bytes from a special file,
+        unlock the visited file if we locked it.
+        (Fmake_symbolic_link, Frecent_auto_save_p): Doc fixes.
+        (Ffile_exists_p, Ffile_symlink_p): Doc fixes. 
+
 2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * emacs.c (main) [MAC_OS8]: Call init_atimer before mac_term_init.
diff --git a/src/alloc.c b/src/alloc.c
index 43db28e08a0..35ce8a5cfa1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -535,6 +535,12 @@ memory_full ()
     Fsignal (Qnil, Vmemory_signal_data);
 }
 
+DEFUN ("memory-full-p", Fmemory_full_p, Smemory_full_p, 0, 0, 0,
+       doc: /* t if memory is nearly full, nil otherwise.  */)
+  ()
+{
+  return (spare_memory ? Qnil : Qt);
+}
 
 /* Called if we can't allocate relocatable space for a buffer.  */
 
@@ -6080,6 +6086,7 @@ The time is in seconds as a floating point value.  */);
   DEFVAR_INT ("gcs-done", &gcs_done,
               doc: /* Accumulated number of garbage collections done.  */);
 
+  defsubr (&Smemory_full_p);
   defsubr (&Scons);
   defsubr (&Slist);
   defsubr (&Svector);
diff --git a/src/emacs.c b/src/emacs.c
index a1805c6497a..f435a3959a3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2441,16 +2441,16 @@ syms_of_emacs ()
 Many arguments are deleted from the list as they are processed.  */);
 
   DEFVAR_LISP ("system-type", &Vsystem_type,
-+              doc: /* Value is symbol indicating type of operating system you are using.
-+Special values:
-+  `gnu/linux'   compiled for a GNU/Linux system.
-+  `darwin'      compiled for Darwin (GNU-Darwin, Mac OS X, ...).
-+  `macos'       compiled for Mac OS 9.
-+  `ms-dos'      compiled as an MS-DOS application.
-+  `windows-nt'  compiled as a native W32 application.
-+  `cygwin'      compiled using the Cygwin library.
-+  `vax-vms' or `axp-vms': compiled for a (Open)VMS system.
-+Anything else indicates some sort of Unix system.  */);
+               doc: /* Value is symbol indicating type of operating system you are using.
+Special values:
+  `gnu/linux'   compiled for a GNU/Linux system.
+  `darwin'      compiled for Darwin (GNU-Darwin, Mac OS X, ...).
+  `macos'       compiled for Mac OS 9.
+  `ms-dos'      compiled as an MS-DOS application.
+  `windows-nt'  compiled as a native W32 application.
+  `cygwin'      compiled using the Cygwin library.
+  `vax-vms' or `axp-vms': compiled for a (Open)VMS system.
+Anything else indicates some sort of Unix system.  */);
   Vsystem_type = intern (SYSTEM_TYPE);
 
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
diff --git a/src/fileio.c b/src/fileio.c
index b62dac5b3d7..eaa2d184f1d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -375,7 +375,10 @@ use the standard functions without calling themselves recursively.  */)
           Lisp_Object string = XCAR (elt);
           int match_pos;
           Lisp_Object handler = XCDR (elt);
-          Lisp_Object operations = Fget (handler, Qoperations);
+          Lisp_Object operations = Qnil;
+
+          if (SYMBOLP (handler))
+            operations = Fget (handler, Qoperations);
 
           if (STRINGP (string)
               && (match_pos = fast_string_match (string, filename)) > pos
@@ -2864,7 +2867,8 @@ This is what happens in interactive use with M-x.  */)
 #ifdef S_IFLNK
 DEFUN ("make-symbolic-link", Fmake_symbolic_link, Smake_symbolic_link, 2, 3,
        "FMake symbolic link to file: \nGMake symbolic link to file %s: \np",
-       doc: /* Make a symbolic link to FILENAME, named LINKNAME.  Both args must be strings.
+       doc: /* Make a symbolic link to FILENAME, named LINKNAME.
+Both args must be strings.
 Signals a `file-already-exists' error if a file LINKNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
 A number as third arg means request confirmation if LINKNAME already exists.
@@ -3062,8 +3066,10 @@ check_writable (filename)
 }
 
 DEFUN ("file-exists-p", Ffile_exists_p, Sfile_exists_p, 1, 1, 0,
-       doc: /* Return t if file FILENAME exists.  (This does not mean you can read it.)
-See also `file-readable-p' and `file-attributes'.  */)
+       doc: /* Return t if file FILENAME exists (whether or not you can read it.)
+See also `file-readable-p' and `file-attributes'.
+This returns nil for a symlink to a nonexistent file.
+Use `file-symlink-p' to test for such links.  */)
      (filename)
      Lisp_Object filename;
 {
@@ -3240,7 +3246,10 @@ If there is no error, returns nil.  */)
 DEFUN ("file-symlink-p", Ffile_symlink_p, Sfile_symlink_p, 1, 1, 0,
        doc: /* Return non-nil if file FILENAME is the name of a symbolic link.
 The value is the link target, as a string.
-Otherwise returns nil.  */)
+Otherwise it returns nil.
+
+This function returns t when given the name of a symlink that
+points to a nonexistent file.  */)
      (filename)
      Lisp_Object filename;
 {
@@ -3730,6 +3739,8 @@ actually used.  */)
   int set_coding_system = 0;
   int coding_system_decided = 0;
   int read_quit = 0;
+  int old_Vdeactivate_mark = Vdeactivate_mark;
+  int we_locked_file = 0;
 
   if (current_buffer->base_buffer && ! NILP (visit))
     error ("Cannot do file visiting in an indirect buffer");
@@ -4402,8 +4413,17 @@ actually used.  */)
     /* For a special file, all we can do is guess.  */
     total = READ_BUF_SIZE;
 
-  if (NILP (visit) && total > 0)
-    prepare_to_modify_buffer (PT, PT, NULL);
+  if (NILP (visit) && inserted > 0)
+    {
+#ifdef CLASH_DETECTION
+      if (!NILP (current_buffer->file_truename)
+          /* Make binding buffer-file-name to nil effective.  */
+          && !NILP (current_buffer->filename)
+          && SAVE_MODIFF >= MODIFF)
+        we_locked_file = 1;
+#endif /* CLASH_DETECTION */
+      prepare_to_modify_buffer (GPT, GPT, NULL);
+    }
 
   move_gap (PT);
   if (GAP_SIZE < total)
@@ -4493,6 +4513,18 @@ actually used.  */)
       }
   }
 
+  /* Now we have read all the file data into the gap.
+     If it was empty, undo marking the buffer modified.  */
+
+  if (inserted == 0)
+    {
+#ifdef CLASH_DETECTION
+      if (we_locked_file)
+        unlock_file (current_buffer->file_truename);
+#endif
+      Vdeactivate_mark = old_Vdeactivate_mark;
+    }
+
   /* Make the text read part of the buffer.  */
   GAP_SIZE -= inserted;
   GPT      += inserted;
@@ -6038,7 +6070,10 @@ DEFUN ("clear-buffer-auto-save-failure", Fclear_buffer_auto_save_failure,
 
 DEFUN ("recent-auto-save-p", Frecent_auto_save_p, Srecent_auto_save_p,
        0, 0, 0,
-       doc: /* Return t if current buffer has been auto-saved since last read in or saved.  */)
+       doc: /* Return t if current buffer has been auto-saved recently.
+More precisely, if it has been auto-saved since last read from or saved
+in the visited file.  If the buffer has no visited file,
+then any auto-save counts as "recent".  */)
      ()
 {
   return (SAVE_MODIFF < current_buffer->auto_save_modified) ? Qt : Qnil;
diff --git a/src/process.c b/src/process.c
index c6a9b255243..a557ee30c27 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5108,6 +5108,7 @@ send_process_trap ()
   sigrelse (SIGPIPE);
   sigrelse (SIGALRM);
 #endif /* BSD4_1 */
+  sigunblock (sigmask (SIGPIPE));
   longjmp (send_process_frame, 1);
 }
 
@@ -5299,7 +5300,11 @@ send_process (proc, buf, len, object)
                                0, datagram_address[outfd].sa,
                                datagram_address[outfd].len);
                   if (rv < 0 && errno == EMSGSIZE)
-                    report_file_error ("sending datagram", Fcons (proc, Qnil));
+                    {
+                      signal (SIGPIPE, old_sigpipe);
+                      report_file_error ("sending datagram",
+                                         Fcons (proc, Qnil));
+                    }
                 }
               else
 #endif
diff --git a/src/xdisp.c b/src/xdisp.c
index 92e85dd8786..7d4ac6916fa 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6909,7 +6909,9 @@ message2_nolog (m, nbytes, multibyte)
 /* Display an echo area message M with a specified length of NBYTES
    bytes.  The string may include null characters.  If M is not a
    string, clear out any existing message, and let the mini-buffer
-   text show through.  */
+   text show through.
+
+   This function cancels echoing.  */
 
 void
 message3 (m, nbytes, multibyte)
@@ -6921,6 +6923,7 @@ message3 (m, nbytes, multibyte)
 
   GCPRO1 (m);
   clear_message (1,1);
+  cancel_echoing ();
 
   /* First flush out any partial line written with print.  */
   message_log_maybe_newline ();
@@ -6932,7 +6935,10 @@ message3 (m, nbytes, multibyte)
 }
 
 
-/* The non-logging version of message3.  */
+/* The non-logging version of message3.
+   This does not cancel echoing, because it is used for echoing.
+   Perhaps we need to make a separate function for echoing
+   and make this cancel echoing.  */
 
 void
 message3_nolog (m, nbytes, multibyte)