Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074

6 files changed, 39 insertions, 30 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cc82a6dbc98..29a4e7ba636 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2008-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * intervals.h (INT_LISPLIKE): Remove.  It may misfire.
+        (NULL_INTERVAL_P, SET_INTERVAL_PARENT): Don't use it.
+
+2008-02-18  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (Fw32_shell_execute): Encode parameters.
+
+2008-02-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (syms_of_fileio) <insert-default-directory>: Doc fix.
+
+2008-02-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * unexhp9k800.c (read_header): Replace `legal' with `valid'.
+
 2008-02-24  Ulrich Neumerkel  <ulrich@complang.tuwien.ac.at>  (tiny change)
 
         * xterm.c (x_set_offset): Don't change the gravity if
diff --git a/src/fileio.c b/src/fileio.c
index 525d2c889b1..e2d399f5a45 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6619,19 +6619,25 @@ of file names regardless of the current language environment.  */);
 
   DEFVAR_BOOL ("insert-default-directory", &insert_default_directory,
                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'.
+
+When the initial minibuffer contents show a name of a file or a directory,
+typing RETURN without editing the initial contents is equivalent to typing
+the default file name.
+
 If this variable is non-nil, the minibuffer contents are always
-initially non-empty and typing RETURN without editing will fetch the
+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.
+is not necessarily the same as initial contents inserted in the minibuffer,
+if the initial contents 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.  */);
+request the default name; typing RETURN without editing will leave
+the minibuffer empty.
+
+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'.  */);
   insert_default_directory = 1;
 
   DEFVAR_BOOL ("vms-stmlf-recfm", &vms_stmlf_recfm,
diff --git a/src/intervals.h b/src/intervals.h
index c15611388f1..228c249f41b 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -75,24 +75,7 @@ struct interval
 /* Size of a pointer to an interval structure */
 #define INTERVAL_PTR_SIZE (sizeof (struct interval *))
 
-/* True if an interval pointer is null, or is a Lisp_Buffer or
-   Lisp_String pointer (meaning it points to the owner of this
-   interval tree). */
-#ifdef NO_UNION_TYPE
-#define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object)(i)) \
-                         || STRINGP ((Lisp_Object)(i)))
-#else
-#define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object){(EMACS_INT)(i)}) \
-                         || STRINGP ((Lisp_Object){(EMACS_INT)(i)}))
-#endif
-
-#ifdef ENABLE_CHECKING
-#define NULL_INTERVAL_P(i) \
-   (CHECK (!INT_LISPLIKE (i), "non-interval"), (i) == NULL_INTERVAL)
-/* old #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL || INT_LISPLIKE (i)) */
-#else
 #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL)
-#endif
 
 /* True if this interval has no right child. */
 #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL)
@@ -162,7 +145,7 @@ struct interval
    casts to get around this, it will break some development work in
    progress.  */
 #define SET_INTERVAL_PARENT(i,p) \
-   (eassert (!INT_LISPLIKE (p)), (i)->up_obj = 0, (i)->up.interval = (p))
+   ((i)->up_obj = 0, (i)->up.interval = (p))
 #define SET_INTERVAL_OBJECT(i,o) \
    (eassert (BUFFERP (o) || STRINGP (o)), (i)->up_obj = 1, (i)->up.obj = (o))
 #define INTERVAL_PARENT(i) \
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
index 495094029d6..96eb985f857 100644
--- a/src/unexhp9k800.c
+++ b/src/unexhp9k800.c
@@ -228,7 +228,7 @@ read_header (file, hdr, auxhdr)
   if (hdr->a_magic != EXEC_MAGIC && hdr->a_magic != SHARE_MAGIC
       &&  hdr->a_magic != DEMAND_MAGIC)
     {
-      fprintf (stderr, "a.out file doesn't have legal magic number\n");
+      fprintf (stderr, "a.out file doesn't have valid magic number\n");
       exit (1);
     }
 
diff --git a/src/w32.c b/src/w32.c
index 15ecda69f55..3107af8f4a1 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1701,7 +1701,7 @@ is_fat_volume (const char * name, const char ** pPath)
   return FALSE;
 }
 
-/* Map filename to a legal 8.3 name if necessary. */
+/* Map filename to a valid 8.3 name if necessary. */
 const char *
 map_w32_filename (const char * name, const char ** pPath)
 {
diff --git a/src/w32fns.c b/src/w32fns.c
index 062d36dc10f..838367fe399 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8346,9 +8346,12 @@ an integer representing a ShowWindow flag:
 
   CHECK_STRING (document);
 
-  /* Encode filename and current directory.  */
+  /* Encode filename, current directory and parameters.  */
   current_dir = ENCODE_FILE (current_buffer->directory);
   document = ENCODE_FILE (document);
+  if (STRINGP (parameters))
+    parameters = ENCODE_SYSTEM (parameters);
+
   if ((int) ShellExecute (NULL,
                           (STRINGP (operation) ?
                            SDATA (operation) : NULL),