Merged from miles@gnu.org--gnu-2005 (patch 281-285)

Patches applied:

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

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

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

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

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

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

13 files changed, 137 insertions, 47 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9fc43e0bd4a..47d24852a66 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,52 @@
+2005-05-01  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * sysdep.c (get_frame_size) [VMS]: Use a fresh i/o channel.
+
+2005-04-30  Richard M. Stallman  <rms@gnu.org>
+
+        * fileio.c (Ffind_file_name_handler): Handle the `operations'
+        property of the file name handler.
+        (Qoperations): New variable.
+        (syms_of_fileio): Initialize and staticpro it.
+
+        * xdisp.c (set_message_1): Delete xassert.
+
+2005-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c: Don't include time.h.  Include sysselect.h after
+        systime.h.
+
+        * macfns.c (Fx_server_version): Add BLOCK_INPUT around Gestalt.
+
+        * macgui.h [HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime
+        before/after including Carbon.h if there is a working mktime.
+
+2005-04-28  Kim F. Storm  <storm@cua.dk>
+
+        * xfaces.c (resolve_face_name): Add arg SIGNAL_P.  Calls changed.
+        Fix cyclic alias check.  If alias loop is detected, signal
+        circular-list error if SIGNAL_P, and return Qdefault if !SIGNAL_P.
+
+2005-04-28  Lute Kamstra  <lute@gnu.org>
+
+        * eval.c (do_autoload): Record only autoloads in the autoload
+        property of symbols.
+
+2005-04-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * emacs.c (USAGE1): Add --basic-display and --quick options.
+
+2005-04-27  Kim F. Storm  <storm@cua.dk>
+
+        * data.c (syms_of_data) Staticpro Qcyclic_variable_indirection.
+
+2005-04-26  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (Fsame_window_p, Fspecial_display_p): Doc fixes.
+        (syms_of_window): Doc fixes.
+
+        * indent.c (Fvertical_motion): Undo previous change.
+
 2005-04-26  Kenichi Handa  <handa@m17n.org>
 
         * fns.c (char_table_range): New function.
@@ -61,7 +110,7 @@
         [USE_CARBON_EVENTS && MAC_OSX] (Qpreferences, Qservices, Qpaste)
         (Qperform): New variables.
         (syms_of_mac) [USE_CARBON_EVENTS && MAC_OSX]: Initialize them.
-        (do_get_menus) [!TARGET_API_MAC_CARBON]: Don't call AppendResMenu.
+        (do_get_menus) [TARGET_API_MAC_CARBON]: Don't call AppendResMenu.
         (do_menu_choice): Unhighlight menu bar also when menu_id is 0.
         (mac_store_application_menu_event, init_menu_bar): New functions.
         [USE_CARBON_EVENTS] (mac_handle_command_event)
diff --git a/src/data.c b/src/data.c
index f6285320315..7bbb45ae043 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3181,6 +3181,7 @@ syms_of_data ()
   staticpro (&Qargs_out_of_range);
   staticpro (&Qvoid_function);
   staticpro (&Qcyclic_function_indirection);
+  staticpro (&Qcyclic_variable_indirection);
   staticpro (&Qvoid_variable);
   staticpro (&Qsetting_constant);
   staticpro (&Qinvalid_read_syntax);
diff --git a/src/emacs.c b/src/emacs.c
index 1a6f323ed06..c084f61fd07 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -265,7 +265,8 @@ Initialization options:\n\
 --no-shared-memory, -nl     do not use shared memory\n\
 --no-site-file              do not load site-start.el\n\
 --no-splash                 do not display a splash screen on startup\n\
---no-window-system, -nw     don't communicate with X, ignoring $DISPLAY\n\
+--no-window-system, -nw     do not communicate with X, ignoring $DISPLAY\n\
+--quick, -Q                 equivalent to -q --no-site-file\n\
 --script FILE               run FILE as an Emacs Lisp script\n\
 --terminal, -t DEVICE       use DEVICE for terminal I/O\n\
 --unibyte, --no-multibyte   run Emacs in unibyte mode\n\
@@ -295,6 +296,8 @@ FILE                    visit FILE using find-file\n\
 Display options:\n\
 \n\
 --background-color, -bg COLOR   window background color\n\
+--basic-display, -D             disable many display features;\n\
+                                  used for debugging Emacs\n\
 --border-color, -bd COLOR       main border color\n\
 --border-width, -bw WIDTH       width of main border\n\
 --color, --color=MODE           color mode for character terminals;\n\
diff --git a/src/eval.c b/src/eval.c
index 8700ca222ce..6832f3197ad 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 99, 2000, 2001, 02, 2004
-     Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
+     2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1982,10 +1982,7 @@ do_autoload (fundef, funname)
       second = Fcdr (first);
       first = Fcar (first);
 
-      /* Note: This test is subtle.  The cdr of an autoload-queue entry
-         may be an atom if the autoload entry was generated by a defalias
-         or fset.  */
-      if (CONSP (second))
+      if (CONSP (second) && EQ (XCAR (second), Qautoload))
         Fput (first, Qautoload, (XCDR (second)));
 
       queue = XCDR (queue);
diff --git a/src/fileio.c b/src/fileio.c
index 340a8a36cfd..d8a0a5a729f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -177,6 +177,10 @@ Lisp_Object Vdefault_file_name_coding_system;
    whose I/O is done with a special handler.  */
 Lisp_Object Vfile_name_handler_alist;
 
+/* Property name of a file name handler,
+   which gives a list of operations it handles..  */
+Lisp_Object Qoperations;
+
 /* Lisp functions for translating file formats */
 Lisp_Object Qformat_decode, Qformat_annotate_function;
 
@@ -368,13 +372,16 @@ use the standard functions without calling themselves recursively.  */)
       elt = XCAR (chain);
       if (CONSP (elt))
         {
-          Lisp_Object string;
+          Lisp_Object string = XCAR (elt);
           int match_pos;
-          string = XCAR (elt);
+          Lisp_Object handler = XCDR (elt);
+          Lisp_Object operations = Fget (handler, Qoperations);
+
           if (STRINGP (string)
-              && (match_pos = fast_string_match (string, filename)) > pos)
+              && (match_pos = fast_string_match (string, filename)) > pos
+              && (NILP (operations) || ! NILP (Fmemq (operation, operations))))
             {
-              Lisp_Object handler, tem;
+              Lisp_Object tem;
 
               handler = XCDR (elt);
               tem = Fmemq (handler, inhibited_handlers);
@@ -6439,6 +6446,7 @@ init_fileio_once ()
 void
 syms_of_fileio ()
 {
+  Qoperations = intern ("operations");
   Qexpand_file_name = intern ("expand-file-name");
   Qsubstitute_in_file_name = intern ("substitute-in-file-name");
   Qdirectory_file_name = intern ("directory-file-name");
@@ -6473,6 +6481,7 @@ syms_of_fileio ()
   Qset_visited_file_modtime = intern ("set-visited-file-modtime");
   Qauto_save_coding = intern ("auto-save-coding");
 
+  staticpro (&Qoperations);
   staticpro (&Qexpand_file_name);
   staticpro (&Qsubstitute_in_file_name);
   staticpro (&Qdirectory_file_name);
diff --git a/src/indent.c b/src/indent.c
index d6709d56ee8..39602c60d16 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -67,8 +67,6 @@ static double position_indentation P_ ((int));
 
 int current_column_bol_cache;
 
-extern Lisp_Object Qfontification_functions;
-
 /* Get the display table to use for the current buffer.  */
 
 struct Lisp_Char_Table *
@@ -2051,7 +2049,6 @@ whether or not it is currently displayed in some window.  */)
   struct window *w;
   Lisp_Object old_buffer;
   struct gcpro gcpro1;
-  int count = SPECPDL_INDEX ();
 
   CHECK_NUMBER (lines);
   if (! NILP (window))
@@ -2069,9 +2066,6 @@ whether or not it is currently displayed in some window.  */)
       XSETBUFFER (w->buffer, current_buffer);
     }
 
-  /* Don't fontify text that we just move across.  */
-  specbind (Qfontification_functions, Qnil);
-
   if (noninteractive)
     {
       struct position pos;
@@ -2117,7 +2111,6 @@ whether or not it is currently displayed in some window.  */)
   if (BUFFERP (old_buffer))
     w->buffer = old_buffer;
 
-  unbind_to (count, Qnil);
   RETURN_UNGCPRO (make_number (it.vpos));
 }
 
diff --git a/src/mac.c b/src/mac.c
index 0a1b94eb2c5..e9930ada151 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -24,12 +24,11 @@ Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <errno.h>
-#include <time.h>
 
 #include "lisp.h"
 #include "process.h"
-#include "sysselect.h"
 #include "systime.h"
+#include "sysselect.h"
 #include "blockinput.h"
 
 #include "macterm.h"
diff --git a/src/macfns.c b/src/macfns.c
index b85c4f01795..a8b685582d5 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2969,8 +2969,13 @@ If omitted or nil, that stands for the selected frame's display.  */)
 {
   int mac_major_version;
   SInt32 response;
+  OSErr err;
 
-  if (Gestalt (gestaltSystemVersion, &response) != noErr)
+  BLOCK_INPUT;
+  err = Gestalt (gestaltSystemVersion, &response);
+  UNBLOCK_INPUT;
+
+  if (err != noErr)
     error ("Cannot get Mac OS version");
 
   mac_major_version = (response >> 8) & 0xff;
diff --git a/src/macgui.h b/src/macgui.h
index 5d4f1894e2e..939496aaeef 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -32,7 +32,9 @@ typedef unsigned long Time;
 #ifdef HAVE_CARBON
 #undef Z
 #ifdef MAC_OSX
+#if ! HAVE_MKTIME || BROKEN_MKTIME
 #undef mktime
+#endif
 #undef DEBUG
 #undef free
 #undef malloc
@@ -43,8 +45,10 @@ typedef unsigned long Time;
 #undef min
 #undef init_process
 #include <Carbon/Carbon.h>
+#if ! HAVE_MKTIME || BROKEN_MKTIME
 #undef mktime
 #define mktime emacs_mktime
+#endif
 #undef free
 #define free unexec_free
 #undef malloc
diff --git a/src/sysdep.c b/src/sysdep.c
index 706f0e1305e..4127517b98f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1793,10 +1793,16 @@ get_tty_size (int fd, int *widthp, int *heightp)
 #else
 #ifdef VMS
 
+  /* Use a fresh channel since the current one may have stale info
+     (for example, from prior to a suspend); and to avoid a dependency
+     in the init sequence.  */
+  int chan;
   struct sensemode tty;
 
-  SYS$QIOW (0, fd, IO$_SENSEMODE, &tty, 0, 0,
-            &tty.class, 12, 0, 0, 0, 0);
+  SYS$ASSIGN (&input_dsc, &chan, 0, 0);
+  SYS$QIOW (0, chan, IO$_SENSEMODE, &tty, 0, 0,
+            &tty.class, 12, 0, 0, 0, 0);
+  SYS$DASSGN (chan);
   *widthp = tty.scr_wid;
   *heightp = tty.scr_len;
 
diff --git a/src/window.c b/src/window.c
index ed177693e53..67cbd73bc50 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3265,9 +3265,10 @@ display_buffer_1 (window)
 
 DEFUN ("special-display-p", Fspecial_display_p, Sspecial_display_p, 1, 1, 0,
        doc: /* Returns non-nil if a buffer named BUFFER-NAME gets a special frame.
-If the value is t, a frame would be created for that buffer
-using the default frame parameters.  If the value is a list,
-it is a list of frame parameters that would be used
+If the value is t, `display-buffer' or `pop-to-buffer' would create a
+special frame for that buffer using the default frame parameters.
+
+If the value is a list, it is a list of frame parameters that would be used
 to make a frame for that buffer.
 The variables `special-display-buffer-names'
 and `special-display-regexps' control this.  */)
@@ -3301,7 +3302,9 @@ and `special-display-regexps' control this.  */)
 }
 
 DEFUN ("same-window-p", Fsame_window_p, Ssame_window_p, 1, 1, 0,
-       doc: /* Returns non-nil if a new buffer named BUFFER-NAME would use the same window.
+       doc: /* Returns non-nil if a buffer named BUFFER-NAME would use the same window.
+More precisely, if `display-buffer' or `pop-to-buffer' would display
+that buffer in the selected window rather than (as usual) in some other window.
 See `same-window-buffer-names' and `same-window-regexps'.  */)
      (buffer_name)
      Lisp_Object buffer_name;
@@ -6750,7 +6753,8 @@ where `pop-up-frame-alist' would hold the default frame parameters.  */);
 
   DEFVAR_LISP ("special-display-buffer-names", &Vspecial_display_buffer_names,
                doc: /* *List of buffer names that should have their own special frames.
-Displaying a buffer whose name is in this list makes a special frame for it
+Displaying a buffer with `display-buffer' or `pop-to-buffer',
+if its name is in this list, makes a special frame for it
 using `special-display-function'.  See also `special-display-regexps'.
 
 An element of the list can be a list instead of just a string.
@@ -6775,9 +6779,9 @@ Those variables take precedence over this one.  */);
 
   DEFVAR_LISP ("special-display-regexps", &Vspecial_display_regexps,
                doc: /* *List of regexps saying which buffers should have their own special frames.
-If a buffer name matches one of these regexps, it gets its own frame.
-Displaying a buffer whose name is in this list makes a special frame for it
-using `special-display-function'.
+When displaying a buffer with `display-buffer' or `pop-to-buffer',
+if any regexp in this list matches the buffer name, it makes a
+special frame for the buffer by calling `special-display-function'.
 
 An element of the list can be a list instead of just a string.
 There are two ways to use a list as an element:
diff --git a/src/xdisp.c b/src/xdisp.c
index 9c15313efa3..288b6356b49 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7901,8 +7901,6 @@ set_message_1 (a1, a2, nbytes, multibyte_p)
   const char *s = (const char *) a1;
   Lisp_Object string = a2;
 
-  xassert (BEG == Z);
-
   /* Change multibyteness of the echo buffer appropriately.  */
   if (message_enable_multibyte
       != !NILP (current_buffer->enable_multibyte_characters))
diff --git a/src/xfaces.c b/src/xfaces.c
index 1960e72b710..2884bccb3b9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -336,6 +336,8 @@ extern Lisp_Object Qmode_line;
 
 Lisp_Object Qface_alias;
 
+extern Lisp_Object Qcircular_list;
+
 /* Default stipple pattern used on monochrome displays.  This stipple
    pattern is used on monochrome displays instead of shades of gray
    for a face background color.  See `set-face-stipple' for possible
@@ -471,7 +473,7 @@ struct named_merge_point;
 
 static void map_tty_color P_ ((struct frame *, struct face *,
                                enum lface_attribute_index, int *));
-static Lisp_Object resolve_face_name P_ ((Lisp_Object));
+static Lisp_Object resolve_face_name P_ ((Lisp_Object, int));
 static int may_use_scalable_font_p P_ ((const char *));
 static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object));
 static int better_font_p P_ ((int *, struct font_name *, struct font_name *,
@@ -3220,27 +3222,47 @@ resolve_face_name_error (ignore)
 }
 
 /* Resolve face name FACE_NAME.  If FACE_NAME is a string, intern it
-   to make it a symvol.  If FACE_NAME is an alias for another face,
-   return that face's name.  */
+   to make it a symbol.  If FACE_NAME is an alias for another face,
+   return that face's name.
+
+   Return default face in case of errors.  */
 
 static Lisp_Object
-resolve_face_name (face_name)
+resolve_face_name (face_name, signal_p)
      Lisp_Object face_name;
+     int signal_p;
 {
-  Lisp_Object aliased;
-  int alias_loop_max = 10;
+  Lisp_Object orig_face;
+  Lisp_Object tortoise, hare;
 
   if (STRINGP (face_name))
     face_name = intern (SDATA (face_name));
 
-  while (SYMBOLP (face_name))
+  if (NILP (face_name) || !SYMBOLP (face_name))
+    return face_name;
+
+  orig_face = face_name;
+  tortoise = hare = face_name;
+
+  while (1)
     {
-      aliased = Fget (face_name, Qface_alias);
-      if (NILP (aliased))
+      face_name = hare;
+      hare = Fget (hare, Qface_alias);
+      if (NILP (hare) || !SYMBOLP (hare))
         break;
-      if (--alias_loop_max == 0)
+
+      face_name = hare;
+      hare = Fget (hare, Qface_alias);
+      if (NILP (hare) || !SYMBOLP (hare))
         break;
-      face_name = aliased;
+
+      tortoise = Fget (tortoise, Qface_alias);
+      if (EQ (hare, tortoise))
+        {
+          if (signal_p)
+            Fsignal (Qcircular_list, Fcons (orig_face, Qnil));
+          return Qdefault;
+        }
     }
 
   return face_name;
@@ -3264,7 +3286,7 @@ lface_from_face_name (f, face_name, signal_p)
 {
   Lisp_Object lface;
 
-  face_name = resolve_face_name (face_name);
+  face_name = resolve_face_name (face_name, signal_p);
 
   if (f)
     lface = assq_no_quit (face_name, f->face_alist);
@@ -3999,7 +4021,7 @@ FRAME 0 means change the face on all frames, and change the default
   CHECK_SYMBOL (face);
   CHECK_SYMBOL (attr);
 
-  face = resolve_face_name (face);
+  face = resolve_face_name (face, 1);
 
   /* If FRAME is 0, change face on all frames, and change the
      default for new frames.  */