11 files changed, 182 insertions, 58 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ec60d4add5f..26b8a9ce5ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,40 @@
+2005-04-10  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs.c (standard_args): Rename --bare-bones to --quick.
+        Add -D aka --basic-display.
+
+        * buffer.c (Fmake_indirect_buffer): Clear out some local variables.
+
+2005-04-09  Richard M. Stallman  <rms@gnu.org>
+
+        * keymap.c (where_is_internal): Convert a string used as event type
+        into "(any string)".
+
+        * lread.c (Vloads_in_progress): Not static.
+
+        * fns.c (Vloads_in_progress): Add extern.
+        (Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.
+
+2005-04-09  Thien-Thi Nguyen  <ttn@surf.glug.org>
+
+        * dispnew.c (mirror_line_dance): Avoid crash if W2 is null.
+
+2005-04-09  Lute Kamstra  <lute@gnu.org>
+
+        * print.c (PRINTPREPARE): Check if the marker PRINTCHARFUN is
+        within the accessible part of the buffer.
+
+2005-04-09  Kim F. Storm  <storm@cua.dk>
+
+        * lread.c (readevalloop): Add args START and END as region in
+        current buffer to read.  Callers changed.
+        When specified, narrow to this region only when reading,
+        not during eval.  Track next point to read from during eval.
+        Also restore point to "real" buffer position before eval.
+        (Feval_region): Don't save excursion and restriction here, and
+        don't narrow to region.  Just pass region to readevalloop.
+        Note: Point is now preserved even when PRINTFLAG is nil.
+
 2005-04-08  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (syms_of_xdisp): Init overlay-arrow-string to "=>".
@@ -30,8 +67,8 @@
 
 2005-04-01  Kenichi Handa  <handa@m17n.org>
 
-        * lisp.h (Vascii_upcase_table, Vascii_canon_table,
-        Vascii_eqv_table): Extern them.
+        * lisp.h (Vascii_upcase_table, Vascii_canon_table)
+        (Vascii_eqv_table): Extern them.
 
         * casetab.c (set_case_table): If standard is nonzero, setup
         Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table.
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 67569eedeca..2da83619eb4 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -1079,7 +1079,7 @@
         scroll_bar_up_arrow, scroll_bar_down_arrow.
         (win32_scroll_bar_click): New enum constant.
 
-1996-05-03  Andrw Innes  <andrewi@harlequin.co.uk>
+1996-05-03  Andrew Innes  <andrewi@harlequin.co.uk>
 
         * makefile.nt (SUBSYSTEM) [NTGUI]: Remove conditional.
         (LINK_FLAGS): Explicitly set base address, and stack and heap sizes.
diff --git a/src/buffer.c b/src/buffer.c
index c934bdf22c3..1fba9136375 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -630,7 +630,21 @@ CLONE nil means the indirect buffer's state is reset to default values.  */)
       XMARKER (b->zv_marker)->insertion_type = 1;
     }
   else
-    clone_per_buffer_values (b->base_buffer, b);
+    {
+      struct buffer *old_b = current_buffer;
+
+      clone_per_buffer_values (b->base_buffer, b);
+      b->filename = Qnil;
+      b->file_truename = Qnil;
+      b->display_count = make_number (0);
+      b->backed_up = Qnil;
+      b->auto_save_file_name = Qnil;
+      set_buffer_internal_1 (b);
+      Fset (intern ("buffer-save-without-query"), Qnil);
+      Fset (intern ("buffer-file-number"), Qnil);
+      Fset (intern ("buffer-stale-function"), Qnil);
+      set_buffer_internal_1 (old_b);
+    }
 
   return buf;
 }
@@ -931,7 +945,7 @@ is the default binding of variable. */)
 }
 
 /* Return an alist of the Lisp-level buffer-local bindings of
-   buffer BUF.  That is, do't include  the variables maintained
+   buffer BUF.  That is, don't include the variables maintained
    in special slots in the buffer object.  */
 
 static Lisp_Object
diff --git a/src/dispnew.c b/src/dispnew.c
index 2f807b41cb4..f549a8dde91 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3154,14 +3154,20 @@ mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p)
                   int m2_from;
 
                   w2 = frame_row_to_window (root, frame_from);
-                  m2 = w2->current_matrix;
-                  m2_from = frame_from - m2->matrix_y;
-                  copy_row_except_pointers (m->rows + window_to,
-                                            m2->rows + m2_from);
-
-                  /* If frame line is empty, window line is empty, too.  */
-                  if (!retained_p[copy_from[i]])
-                    m->rows[window_to].enabled_p = 0;
+                  /* ttn@surf.glug.org: when enabling menu bar using `emacs
+                     -nw', FROM_FRAME sometimes has no associated window.
+                     This check avoids a segfault if W2 is null.  */
+                  if (w2)
+                    {
+                      m2 = w2->current_matrix;
+                      m2_from = frame_from - m2->matrix_y;
+                      copy_row_except_pointers (m->rows + window_to,
+                                                m2->rows + m2_from);
+
+                      /* If frame line is empty, window line is empty, too.  */
+                      if (!retained_p[copy_from[i]])
+                        m->rows[window_to].enabled_p = 0;
+                    }
                   sync_p = 1;
                 }
               else if (from_inside_window_p)
diff --git a/src/emacs.c b/src/emacs.c
index f6d32e175b3..c368c57a11f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1806,8 +1806,8 @@ struct standard_args standard_args[] =
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },
   /* Now for the options handled in startup.el.  */
-  { "-Q", "--bare-bones", 55, 0 },
-  { "-bare-bones", 0, 55, 0 },
+  { "-Q", "--quick", 55, 0 },
+  { "-quick", 0, 55, 0 },
   { "-q", "--no-init-file", 50, 0 },
   { "-no-init-file", 0, 50, 0 },
   { "-no-site-file", "--no-site-file", 40, 0 },
@@ -1818,6 +1818,8 @@ struct standard_args standard_args[] =
   { "-i", "--icon-type", 15, 0 },
   { "-itype", 0, 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
+  { "-D", "--basic-display", 12, 0},
+  { "--basic-display", 0, 12, 0},
   { "-bg", "--background-color", 10, 1 },
   { "-background", 0, 10, 1 },
   { "-fg", "--foreground-color", 10, 1 },
diff --git a/src/fns.c b/src/fns.c
index 9a3121a3391..e921579f79b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,6 +1,6 @@
 /* Random utility Lisp functions.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001, 02, 03, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
+     2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -66,6 +66,7 @@ int use_file_dialog;
 extern int minibuffer_auto_raise;
 extern Lisp_Object minibuf_window;
 extern Lisp_Object Vlocale_coding_system;
+extern Lisp_Object Vloads_in_progress;
 
 Lisp_Object Qstring_lessp, Qprovide, Qrequire;
 Lisp_Object Qyes_or_no_p_history;
@@ -1147,7 +1148,18 @@ If STRING is multibyte, the result is STRING itself.
 Otherwise it is a newly created string, with no text properties.
 If STRING is unibyte and contains an individual 8-bit byte (i.e. not
 part of a multibyte form), it is converted to the corresponding
-multibyte character of charset `eight-bit-control' or `eight-bit-graphic'.  */)
+multibyte character of charset `eight-bit-control' or `eight-bit-graphic'.
+Beware, this often doesn't really do what you think it does.
+It is similar to (decode-coding-string STRING 'emacs-mule-unix).
+If you're not sure, whether to use `string-as-multibyte' or
+`string-to-multibyte', use `string-to-multibyte'.  Beware:
+   (aref (string-as-multibyte "\201") 0) -> 129 (aka ?\201)
+   (aref (string-as-multibyte "\300") 0) -> 192 (aka ?\300)
+   (aref (string-as-multibyte "\300\201") 0) -> 192 (aka ?\300)
+   (aref (string-as-multibyte "\300\201") 1) -> 129 (aka ?\201)
+but
+   (aref (string-as-multibyte "\201\300") 0) -> 2240
+   (aref (string-as-multibyte "\201\300") 1) -> <error>  */)
      (string)
      Lisp_Object string;
 {
@@ -1181,7 +1193,8 @@ Otherwise it is a newly created string, with no text properties.
 Characters 0200 through 0237 are converted to eight-bit-control
 characters of the same character code.  Characters 0240 through 0377
 are converted to eight-bit-graphic characters of the same character
-codes.  */)
+codes.
+This is similar to (decode-coding-string STRING 'binary)  */)
      (string)
      Lisp_Object string;
 {
@@ -3444,9 +3457,15 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
   CHECK_SYMBOL (feature);
 
   /* Record the presence of `require' in this file
-     even if the feature specified is already loaded.  */
-  LOADHIST_ATTACH (Fcons (Qrequire, feature));
-
+     even if the feature specified is already loaded.
+     But not more than once in any file,
+     and not when we aren't loading a file.  */
+  if (! NILP (Vloads_in_progress))
+    {
+      tem = Fcons (Qrequire, feature);
+      if (NILP (Fmember (tem, Vcurrent_load_list)))
+        LOADHIST_ATTACH (tem);
+    }
   tem = Fmemq (feature, Vfeatures);
 
   if (NILP (tem))
diff --git a/src/keyboard.c b/src/keyboard.c
index 39891b1a95d..48c47502f85 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2252,12 +2252,16 @@ make_ctrl_char (c)
   return c;
 }
 
-/* Display help echo in the echo area.
+/* Display the help-echo property of the character after the mouse pointer.
+   Either show it in the echo area, or call show-help-function to display
+   it by other means (maybe in a tooltip).
 
-   HELP a string means display that string, HELP nil means clear the
-   help echo.  If HELP is a function, call it with OBJECT and POS as
-   arguments; the function should return a help string or nil for
-   none.  For all other types of HELP evaluate it to obtain a string.
+   If HELP is nil, that means clear the previous help echo.
+
+   If HELP is a string, display that string.  If HELP is a function,
+   call it with OBJECT and POS as arguments; the function should
+   return a help string or nil for none.  For all other types of HELP,
+   evaluate it to obtain a string.
 
    WINDOW is the window in which the help was generated, if any.
    It is nil if not in a window.
diff --git a/src/keymap.c b/src/keymap.c
index a55563a4e92..3706ad52c9e 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -765,7 +765,9 @@ usage: (map-keymap FUNCTION KEYMAP)  */)
    remove that.  Also remove a menu help string as second element.
 
    If AUTOLOAD is nonzero, load autoloadable keymaps
-   that are referred to with indirection.  */
+   that are referred to with indirection.
+
+   This can GC because menu_item_eval_property calls Feval.  */
 
 Lisp_Object
 get_keyelt (object, autoload)
@@ -2555,6 +2557,19 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
                 continue;
 
             record_sequence:
+              /* Don't annoy user with strings from a menu such as
+                 Select Paste.  Change them all to "(any string)",
+                 so that there seems to be only one menu item
+                 to report. */
+              if (! NILP (sequence))
+                {
+                  Lisp_Object tem;
+                  tem = Faref (sequence, make_number (XVECTOR (sequence)->size - 1));
+                  if (STRINGP (tem))
+                    Faset (sequence, make_number (XVECTOR (sequence)->size - 1),
+                           build_string ("(any string)"));
+                }
+
               /* It is a true unshadowed match.  Record it, unless it's already
                  been seen (as could happen when inheriting keymaps).  */
               if (NILP (Fmember (sequence, found)))
@@ -2732,7 +2747,7 @@ where_is_internal_2 (args, key, binding)
 }
 
 
-/* This function cannot GC.  */
+/* This function can GC because get_keyelt can.  */
 
 static Lisp_Object
 where_is_internal_1 (binding, key, definition, noindirect, this, last,
diff --git a/src/lread.c b/src/lread.c
index 5b5ea478a16..d36d45c8c7d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -194,7 +194,7 @@ static int new_backquote_flag;
 /* A list of file names for files being loaded in Fload.  Used to
    check for recursive loads.  */
 
-static Lisp_Object Vloads_in_progress;
+Lisp_Object Vloads_in_progress;
 
 /* Non-zero means load dangerous compiled Lisp files.  */
 
@@ -207,6 +207,7 @@ static Lisp_Object Vbytecomp_version_regexp;
 static void to_multibyte P_ ((char **, char **, int *));
 static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object,
                               Lisp_Object (*) (), int,
+                              Lisp_Object, Lisp_Object,
                               Lisp_Object, Lisp_Object));
 static Lisp_Object load_unwind P_ ((Lisp_Object));
 static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object));
@@ -913,7 +914,8 @@ Return t if file exists.  */)
   load_descriptor_list
     = Fcons (make_number (fileno (stream)), load_descriptor_list);
   load_in_progress++;
-  readevalloop (Qget_file_char, stream, file, Feval, 0, Qnil, Qnil);
+  readevalloop (Qget_file_char, stream, file, Feval,
+                0, Qnil, Qnil, Qnil, Qnil);
   unbind_to (count, Qnil);
 
   /* Run any load-hooks for this file.  */
@@ -1291,16 +1293,19 @@ end_of_file_error ()
 
 /* UNIBYTE specifies how to set load_convert_to_unibyte
    for this invocation.
-   READFUN, if non-nil, is used instead of `read'.  */
+   READFUN, if non-nil, is used instead of `read'.
+   START, END is region in current buffer (from eval-region).  */
 
 static void
-readevalloop (readcharfun, stream, sourcename, evalfun, printflag, unibyte, readfun)
+readevalloop (readcharfun, stream, sourcename, evalfun,
+              printflag, unibyte, readfun, start, end)
      Lisp_Object readcharfun;
      FILE *stream;
      Lisp_Object sourcename;
      Lisp_Object (*evalfun) ();
      int printflag;
      Lisp_Object unibyte, readfun;
+     Lisp_Object start, end;
 {
   register int c;
   register Lisp_Object val;
@@ -1328,28 +1333,41 @@ readevalloop (readcharfun, stream, sourcename, evalfun, printflag, unibyte, read
   continue_reading_p = 1;
   while (continue_reading_p)
     {
+      int count1 = SPECPDL_INDEX ();
+
       if (b != 0 && NILP (b->name))
         error ("Reading from killed buffer");
 
+      if (!NILP (start))
+        {
+          record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          record_unwind_protect (save_restriction_restore, save_restriction_save ());
+          Fgoto_char (start);
+          Fnarrow_to_region (make_number (BEGV), end);
+        }
+
       instream = stream;
+    read_next:
       c = READCHAR;
       if (c == ';')
         {
           while ((c = READCHAR) != '\n' && c != -1);
-          continue;
+          goto read_next;
+        }
+      if (c < 0)
+        {
+          unbind_to (count1, Qnil);
+          break;
         }
-      if (c < 0) break;
 
       /* Ignore whitespace here, so we can detect eof.  */
       if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r')
-        continue;
+        goto read_next;
 
       if (!NILP (Vpurify_flag) && c == '(')
         {
-          int count1 = SPECPDL_INDEX ();
           record_unwind_protect (unreadpure, Qnil);
           val = read_list (-1, readcharfun);
-          unbind_to (count1, Qnil);
         }
       else
         {
@@ -1375,6 +1393,10 @@ readevalloop (readcharfun, stream, sourcename, evalfun, printflag, unibyte, read
             val = read_internal_start (readcharfun, Qnil, Qnil);
         }
 
+      if (!NILP (start) && continue_reading_p)
+        start = Fpoint_marker ();
+      unbind_to (count1, Qnil);
+
       val = (*evalfun) (val);
 
       if (printflag)
@@ -1433,7 +1455,8 @@ This function preserves the position of point.  */)
   specbind (Qstandard_output, tem);
   record_unwind_protect (save_excursion_restore, save_excursion_save ());
   BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
-  readevalloop (buf, 0, filename, Feval, !NILP (printflag), unibyte, Qnil);
+  readevalloop (buf, 0, filename, Feval,
+                !NILP (printflag), unibyte, Qnil, Qnil, Qnil);
   unbind_to (count, Qnil);
 
   return Qnil;
@@ -1465,15 +1488,10 @@ This function does not move point.  */)
     tem = printflag;
   specbind (Qstandard_output, tem);
 
-  if (NILP (printflag))
-    record_unwind_protect (save_excursion_restore, save_excursion_save ());
-  record_unwind_protect (save_restriction_restore, save_restriction_save ());
-
-  /* This both uses start and checks its type.  */
-  Fgoto_char (start);
-  Fnarrow_to_region (make_number (BEGV), end);
+  /* readevalloop calls functions which check the type of start and end.  */
   readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval,
-                !NILP (printflag), Qnil, read_function);
+                !NILP (printflag), Qnil, read_function,
+                start, end);
 
   return unbind_to (count, Qnil);
 }
diff --git a/src/print.c b/src/print.c
index 8bb55f21248..47e338e8492 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,6 +1,6 @@
 /* Lisp object printing and output streams.
-   Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 03, 2004
-        Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
+     2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -211,13 +211,17 @@ void print_interval ();
      }                                                                  \
    if (MARKERP (printcharfun))                                          \
      {                                                                  \
-       if (!(XMARKER (original)->buffer))                               \
+       EMACS_INT marker_pos;                                            \
+       if (!(XMARKER (printcharfun)->buffer))                           \
          error ("Marker does not point anywhere");                      \
-       if (XMARKER (original)->buffer != current_buffer)                \
-         set_buffer_internal (XMARKER (original)->buffer);              \
+       if (XMARKER (printcharfun)->buffer != current_buffer)            \
+         set_buffer_internal (XMARKER (printcharfun)->buffer);          \
+       marker_pos = marker_position (printcharfun);                     \
+       if (marker_pos < BEGV || marker_pos > ZV)                        \
+         error ("Marker is outside the accessible part of the buffer"); \
        old_point = PT;                                                  \
        old_point_byte = PT_BYTE;                                        \
-       SET_PT_BOTH (marker_position (printcharfun),                     \
+       SET_PT_BOTH (marker_pos,                                         \
                     marker_byte_position (printcharfun));               \
        start_point = PT;                                                \
        start_point_byte = PT_BYTE;                                      \
diff --git a/src/window.c b/src/window.c
index 574c348c460..e16416d6fb2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3173,6 +3173,9 @@ selects the buffer of the selected window before each command.  */)
   if (EQ (window, selected_window))
     return window;
 
+  /* Store the current buffer's actual point into the
+     old selected window.  It belongs to that window,
+     and when the window is not selected, must be in the window.  */
   if (!NILP (selected_window))
     {
       ow = XWINDOW (selected_window);
@@ -5638,8 +5641,9 @@ the return value is nil.  Otherwise the value is t.  */)
 #endif
 #endif
 
-      /* "Swap out" point from the selected window
-         into its buffer.  We do this now, before
+      /* "Swap out" point from the selected window's buffer
+         into the window itself.  (Normally the pointm of the selected
+         window holds garbage.)  We do this now, before
          restoring the window contents, and prevent it from
          being done later on when we select a new window.  */
       if (! NILP (XWINDOW (selected_window)->buffer))
@@ -5789,10 +5793,11 @@ the return value is nil.  Otherwise the value is t.  */)
       FRAME_ROOT_WINDOW (f) = data->root_window;
       /* Prevent "swapping out point" in the old selected window
          using the buffer that has been restored into it.
-         Use the point value from the beginning of this function
-         since unshow_buffer (called from delete_all_subwindows)
-         could have altered it.  */
+         We already swapped out point that from that window's old buffer.  */
       selected_window = Qnil;
+
+      /* Arrange *not* to restore point in the buffer that was
+         current when the window configuration was saved.  */
       if (EQ (XWINDOW (data->current_window)->buffer, new_current_buffer))
         set_marker_restricted (XWINDOW (data->current_window)->pointm,
                                make_number (old_point),