14 files changed, 220 insertions, 40 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a71cb27cf33..9a93ac894ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,73 @@
+2004-02-02  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (coding_restore_composition): Check invalid
+        composition data more rigidly.
+
+2004-01-30  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * fileio.c (Fread_file_name_internal): Correctly handle the case
+        where insert-default-directory is nil.
+        (Fread_file_name): Always return an empty string if the user exits
+        with an empty minibuffer.  Adapt the docstring accordingly.
+        (syms_of_fileio): Adapt the docstring of insert-default-directory
+        to the change in Fread_file_name.
+
+2004-01-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * alloca.c [!alloca]: Fix the prototype for xfree.
+
+2004-01-29  Kenichi Handa  <handa@m17n.org>
+
+        * fns.c (string_char_to_byte): Optimize for ASCII only string.
+        (string_byte_to_char): Likewise.
+
+2004-01-28  Peter Runestig  <peter@runestig.com>
+
+        * makefile.w32-in, w32fns.c: Add `default-printer-name' function.
+
+2004-01-27  Steven Tamm <steventamm@mac.com>
+
+        * unexmacosx.c (unexec_copy): Do not copy more than was
+        requested to prevent overwriting during unexec.
+
+2004-01-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * process.c (sigchld_handler): Add comment about not calling malloc.
+
+        * process.h: Add extern to synch_process_termsig.
+
+2004-01-27  Steven Tamm <steventamm@mac.com>
+
+        * macterm.c (make_mac_frame, make_mac_terminal_frame): Move
+        setting of scroll bars from make_mac_frame to
+        make_mac_terminal_frame to prevent clobbering of
+        scroll-bar-mode.
+
+2004-01-26  Richard M. Stallman  <rms@gnu.org>
+
+        * search.c (Freplace_match): Handle nonexistent
+        back-references properly.
+
+2004-01-03  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (decode_any_window): New function.
+        (Fwindow_height, Fwindow_width, Fwindow_edges)
+        (Fwindow_pixel_edges, Fwindow_inside_edges)
+        (Fwindow_inside_pixel_edges): Use decode_any_window.
+
+2004-01-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * process.h: synch_process_termsig new variable.
+
+        * callproc.c: Define synch_process_termsig.
+        (Fcall_process): Initiate synch_process_termsig to zero and
+        check if non-zero and get signal name after subprocess has ended.
+
+        * process.c (sigchld_handler): Set synch_process_termsig
+        if terminated by a signal.  synch_process_death setting removed.
+
+        * sysdep.c (mkdir, rmdir): Also check synch_process_termsig.
+
 2004-01-26  Andreas Schwab  <schwab@suse.de>
 
         * print.c (print_preprocess): Declare size as EMACS_INT to not
diff --git a/src/alloca.c b/src/alloca.c
index 460d0ae9a54..e8c8319adc4 100644
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -100,7 +100,7 @@ typedef POINTER_TYPE *pointer;
 #  define free xfree
 
 void *xmalloc _P ((size_t));
-void xfree _P ((void *))
+void xfree _P ((void *));
 
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically
diff --git a/src/callproc.c b/src/callproc.c
index 00068a908fb..73d81d81b18 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -123,6 +123,9 @@ int synch_process_alive;
 /* Nonzero => this is a string explaining death of synchronous subprocess.  */
 char *synch_process_death;
 
+/* Nonzero => this is the signal number that terminated the subprocess.  */
+int synch_process_termsig;
+
 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
 int synch_process_retcode;
@@ -506,6 +509,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        to avoid timing error if process terminates soon.  */
     synch_process_death = 0;
     synch_process_retcode = 0;
+    synch_process_termsig = 0;
 
     if (NILP (error_file))
       fd_error = emacs_open (NULL_DEVICE, O_WRONLY, 0);
@@ -977,6 +981,19 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
   unbind_to (count, Qnil);
 
+  if (synch_process_termsig)
+    {
+      char *signame;
+
+      synchronize_system_messages_locale ();
+      signame = strsignal (synch_process_termsig);
+
+      if (signame == 0)
+        signame = "unknown";
+
+      synch_process_death = signame;
+    }
+
   if (synch_process_death)
     return code_convert_string_norecord (build_string (synch_process_death),
                                          Vlocale_coding_system, 0);
diff --git a/src/coding.c b/src/coding.c
index d9620b90722..7880e439e9d 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5458,6 +5458,9 @@ coding_restore_composition (coding, obj)
               if (method == COMPOSITION_WITH_RULE_ALTCHARS
                   && len % 2 == 0)
                 len --;
+              if (len < 1)
+                /* Invalid composition data.  */
+                break;
               for (j = 0; j < len; j++)
                 args[j] = make_number (data[4 + j]);
               components = (method == COMPOSITION_WITH_ALTCHARS
diff --git a/src/fileio.c b/src/fileio.c
index a2b207169cf..c7959b3672d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6095,6 +6095,7 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte
   if (SCHARS (name) == 0)
     return Qt;
 #endif /* VMS */
+  string = Fexpand_file_name (string, dir);
   if (!NILP (Vread_file_name_predicate))
     return call1 (Vread_file_name_predicate, string);
   return Ffile_exists_p (string);
@@ -6103,15 +6104,20 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte
 DEFUN ("read-file-name", Fread_file_name, Sread_file_name, 1, 6, 0,
        doc: /* Read file name, prompting with PROMPT and completing in directory DIR.
 Value is not expanded---you must call `expand-file-name' yourself.
-Default name to DEFAULT-FILENAME if user enters a null string.
+Default name to DEFAULT-FILENAME if user exits the minibuffer with
+the same non-empty string that was inserted by this function.
  (If DEFAULT-FILENAME is omitted, the visited file name is used,
   except that if INITIAL is specified, that combined with DIR is used.)
+If the user exits with an empty minibuffer, this function returns
+an empty string.  (This can only happen if the user erased the
+pre-inserted contents or if `insert-default-directory' is nil.)
 Fourth arg MUSTMATCH non-nil means require existing file's name.
  Non-nil and non-t means also require confirmation after completion.
 Fifth arg INITIAL specifies text to start with.
-If optional sixth arg PREDICATE is non-nil, possible completions and the
-resulting file name must satisfy (funcall PREDICATE NAME).
-DIR defaults to current buffer's directory default.
+If optional sixth arg PREDICATE is non-nil, possible completions and
+the resulting file name must satisfy (funcall PREDICATE NAME).
+DIR should be an absolute directory name.  It defaults to the value of
+`default-directory'.
 
 If this command was invoked with the mouse, use a file dialog box if
 `use-dialog-box' is non-nil, and the window system or X toolkit in use
@@ -6275,13 +6281,6 @@ provides a file dialog box.  */)
 
   if (!NILP (tem) && !NILP (default_filename))
     val = default_filename;
-  else if (SCHARS (val) == 0 && NILP (insdef))
-    {
-      if (!NILP (default_filename))
-        val = default_filename;
-      else
-        error ("No default file name");
-    }
   val = Fsubstitute_in_file_name (val);
 
   if (replace_in_history)
@@ -6457,7 +6456,20 @@ same format as a regular save would use.  */);
   Vread_file_name_predicate = Qnil;
 
   DEFVAR_BOOL ("insert-default-directory", &insert_default_directory,
-               doc: /* *Non-nil means when reading a filename start with default dir in minibuffer.  */);
+               doc: /* *Non-nil means when reading a filename start with default dir in minibuffer.
+If the initial minibuffer contents are non-empty, you can usually
+request a default filename by typing RETURN without editing.  For some
+commands, exiting with an empty minibuffer has a special meaning,
+such as making the current buffer visit no file in the case of
+`set-visited-file-name'.
+If this variable is non-nil, the minibuffer contents are always
+initially non-empty and typing RETURN without editing will fetch the
+default name, if one is provided.  Note however that this default name
+is not necessarily the name originally inserted in the minibuffer, if
+that is just the default directory.
+If this variable is nil, the minibuffer often starts out empty.  In
+that case you may have to explicitly fetch the next history element to
+request the default name.  */);
   insert_default_directory = 1;
 
   DEFVAR_BOOL ("vms-stmlf-recfm", &vms_stmlf_recfm,
diff --git a/src/fns.c b/src/fns.c
index 6383e09302b..493d7ba2897 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -884,12 +884,11 @@ string_char_to_byte (string, char_index)
   int best_below, best_below_byte;
   int best_above, best_above_byte;
 
-  if (! STRING_MULTIBYTE (string))
-    return char_index;
-
   best_below = best_below_byte = 0;
   best_above = SCHARS (string);
   best_above_byte = SBYTES (string);
+  if (best_above == best_above_byte)
+    return char_index;
 
   if (EQ (string, string_char_byte_cache_string))
     {
@@ -957,12 +956,11 @@ string_byte_to_char (string, byte_index)
   int best_below, best_below_byte;
   int best_above, best_above_byte;
 
-  if (! STRING_MULTIBYTE (string))
-    return byte_index;
-
   best_below = best_below_byte = 0;
   best_above = SCHARS (string);
   best_above_byte = SBYTES (string);
+  if (best_above == best_above_byte)
+    return byte_index;
 
   if (EQ (string, string_char_byte_cache_string))
     {
diff --git a/src/macterm.c b/src/macterm.c
index a4124a0c7bc..9c7c497c00b 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -8205,9 +8205,6 @@ NewMacWindow (FRAME_PTR fp)
 void
 make_mac_frame (struct frame *f)
 {
-  FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
-  FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right;
-
   FRAME_DESIRED_CURSOR (f) = FILLED_BOX_CURSOR;
 
   NewMacWindow(f);
@@ -8256,6 +8253,9 @@ make_mac_terminal_frame (struct frame *f)
   FRAME_COLS (f) = 96;
   FRAME_LINES (f) = 4;
 
+  FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
+  FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right;
+
   make_mac_frame (f);
 
   x_make_gc (f);
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index c8e9addff63..bd5ad98571c 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -140,6 +140,7 @@ LIBS =  $(TLIB0)	\
         $(USER32)       \
         $(MPR)          \
         $(SHELL32)      \
+        $(WINSPOOL)     \
         $(libc)
 
 #
diff --git a/src/process.c b/src/process.c
index 2114d333905..be6094438e9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6094,7 +6094,10 @@ kill_buffer_processes (buffer)
    queued and the signal-catching function will be continually
    reentered until the queue is empty".  Invoking signal() causes the
    kernel to reexamine the SIGCLD queue.  Fred Fish, UniSoft Systems
-   Inc. */
+   Inc.
+
+   ** Malloc WARNING: This should never call malloc either directly or
+   indirectly; if it does, that is a bug  */
 
 SIGTYPE
 sigchld_handler (signo)
@@ -6212,18 +6215,7 @@ sigchld_handler (signo)
           if (WIFEXITED (w))
             synch_process_retcode = WRETCODE (w);
           else if (WIFSIGNALED (w))
-            {
-              int code = WTERMSIG (w);
-              char *signame;
-
-              synchronize_system_messages_locale ();
-              signame = strsignal (code);
-
-              if (signame == 0)
-                signame = "unknown";
-
-              synch_process_death = signame;
-            }
+            synch_process_termsig = WTERMSIG (w);
 
           /* Tell wait_reading_process_input that it needs to wake up and
              look around.  */
diff --git a/src/process.h b/src/process.h
index 2f46e74d4d0..6e2641d6b06 100644
--- a/src/process.h
+++ b/src/process.h
@@ -136,6 +136,9 @@ extern int synch_process_alive;
 /* Nonzero => this is a string explaining death of synchronous subprocess.  */
 extern char *synch_process_death;
 
+/* Nonzero => this is the signal number that terminated the subprocess.  */
+extern int synch_process_termsig;
+
 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
 extern int synch_process_retcode;
diff --git a/src/search.c b/src/search.c
index 020573b75a1..c60d68b9374 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2366,13 +2366,21 @@ since only regular expressions have distinguished subexpressions.  */)
                       substart = search_regs.start[sub];
                       subend = search_regs.end[sub];
                     }
-                  else if (c >= '1' && c <= '9' && c <= search_regs.num_regs + '0')
+                  else if (c >= '1' && c <= '9')
                     {
-                      if (search_regs.start[c - '0'] >= 0)
+                      if (search_regs.start[c - '0'] >= 0
+                          && c <= search_regs.num_regs + '0')
                         {
                           substart = search_regs.start[c - '0'];
                           subend = search_regs.end[c - '0'];
                         }
+                      else
+                        {
+                          /* If that subexp did not match,
+                             replace \\N with nothing.  */
+                          substart = 0;
+                          subend = 0;
+                        }
                     }
                   else if (c == '\\')
                     delbackslash = 1;
diff --git a/src/sysdep.c b/src/sysdep.c
index d8422b839f9..2b7a029b5ba 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3832,7 +3832,8 @@ mkdir (dpath, dmode)
       wait_for_termination (cpid);
     }
 
-  if (synch_process_death != 0 || synch_process_retcode != 0)
+  if (synch_process_death != 0 || synch_process_retcode != 0
+      || synch_process_termsig != 0)
     {
       errno = EIO;              /* We don't know why, but */
       return -1;                /* /bin/mkdir failed */
@@ -3878,7 +3879,8 @@ rmdir (dpath)
       wait_for_termination (cpid);
     }
 
-  if (synch_process_death != 0 || synch_process_retcode != 0)
+  if (synch_process_death != 0 || synch_process_retcode != 0
+      || synch_process_termsig != 0)
     {
       errno = EIO;              /* We don't know why, but */
       return -1;                /* /bin/rmdir failed */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index b8532325973..b41c586d2e0 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -192,6 +192,7 @@ static int
 unexec_copy (off_t dest, off_t src, ssize_t count)
 {
   ssize_t bytes_read;
+  ssize_t bytes_to_read;
 
   char buf[UNEXEC_COPY_BUFSZ];
 
@@ -203,7 +204,8 @@ unexec_copy (off_t dest, off_t src, ssize_t count)
 
   while (count > 0)
     {
-      bytes_read = read (infd, buf, UNEXEC_COPY_BUFSZ);
+      bytes_to_read = count > UNEXEC_COPY_BUFSZ ? UNEXEC_COPY_BUFSZ : count;
+      bytes_read = read (infd, buf, bytes_to_read);
       if (bytes_read <= 0)
         return 0;
       if (write (outfd, buf, bytes_read) != bytes_read)
diff --git a/src/w32fns.c b/src/w32fns.c
index 7bffea34a28..1854c3908bd 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -51,6 +51,7 @@ Boston, MA 02111-1307, USA.  */
 #include <commdlg.h>
 #include <shellapi.h>
 #include <ctype.h>
+#include <winspool.h>
 
 #include <dlgs.h>
 #define FILE_NAME_TEXT_FIELD edt1
@@ -13921,6 +13922,76 @@ If the underlying system call fails, value is nil.  */)
   return value;
 }
 
+DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name,
+       0, 0, 0, doc: /* Return the name of Windows default printer device.  */)
+     ()
+{
+  static char pname_buf[256];
+  int err;
+  HANDLE hPrn;
+  PRINTER_INFO_2 *ppi2 = NULL;
+  DWORD dwNeeded = 0, dwReturned = 0;
+
+  /* Retrieve the default string from Win.ini (the registry).
+   * String will be in form "printername,drivername,portname".
+   * This is the most portable way to get the default printer. */
+  if (GetProfileString ("windows", "device", ",,", pname_buf, sizeof (pname_buf)) <= 0)
+    return Qnil;
+  /* printername precedes first "," character */
+  strtok (pname_buf, ",");
+  /* We want to know more than the printer name */
+  if (!OpenPrinter (pname_buf, &hPrn, NULL))
+    return Qnil;
+  GetPrinter (hPrn, 2, NULL, 0, &dwNeeded);
+  if (dwNeeded == 0)
+    {
+      ClosePrinter (hPrn);
+      return Qnil;
+    }
+  /* Allocate memory for the PRINTER_INFO_2 struct */
+  ppi2 = (PRINTER_INFO_2 *) xmalloc (dwNeeded);
+  if (!ppi2)
+    {
+      ClosePrinter (hPrn);
+      return Qnil;
+    }
+  /* Call GetPrinter() again with big enouth memory block */
+  err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned);
+  ClosePrinter (hPrn);
+  if (!err)
+    {
+      xfree(ppi2);
+      return Qnil;
+    }
+
+  if (ppi2)
+    {
+      if (ppi2->Attributes & PRINTER_ATTRIBUTE_SHARED && ppi2->pServerName)
+        {
+          /* a remote printer */
+          if (*ppi2->pServerName == '\\')
+            _snprintf(pname_buf, sizeof (pname_buf), "%s\\%s", ppi2->pServerName,
+                      ppi2->pShareName);
+          else
+            _snprintf(pname_buf, sizeof (pname_buf), "\\\\%s\\%s", ppi2->pServerName,
+                      ppi2->pShareName);
+          pname_buf[sizeof (pname_buf) - 1] = '\0';
+        }
+      else
+        {
+          /* a local printer */
+          strncpy(pname_buf, ppi2->pPortName, sizeof (pname_buf));
+          pname_buf[sizeof (pname_buf) - 1] = '\0';
+          /* `pPortName' can include several ports, delimited by ','.
+           * we only use the first one. */
+          strtok(pname_buf, ",");
+        }
+      xfree(ppi2);
+    }
+
+  return build_string (pname_buf);
+}
+
 /***********************************************************************
                             Initialization
  ***********************************************************************/
@@ -14373,6 +14444,7 @@ versions of Windows) characters.  */);
   defsubr (&Sw32_find_bdf_fonts);
 
   defsubr (&Sfile_system_info);
+  defsubr (&Sdefault_printer_name);
 
   /* Setting callback functions for fontset handler.  */
   get_font_info_func = w32_get_font_info;