Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-708
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-709
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-710
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-711
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-712
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-713
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-714
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-715
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-716
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-717
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-718
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-719
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-720
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-721
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-722
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-723
   Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.

 * emacs@sv.gnu.org/emacs--devo--0--patch-724
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-725
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-726
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-727
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-728
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-729
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-730
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-731
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-732
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-733
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-734
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-735
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-736
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-737
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-738
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-739
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-740
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-741
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-742
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-743
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--rel--22--base-0
   tag of emacs@sv.gnu.org/emacs--devo--0--patch-709

 * emacs@sv.gnu.org/emacs--rel--22--patch-1
   Sync to CVS tag EMACS_22_BRANCHPOINT

 * emacs@sv.gnu.org/emacs--rel--22--patch-2
   Sync to CVS branch EMACS_22_BASE

 * emacs@sv.gnu.org/emacs--rel--22--patch-3
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-4
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-5
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-6
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-7
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-8
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-9
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-10
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-11
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-12
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-13
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-217
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-218
   Merge from emacs--devo--0, emacs--rel--22

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-219
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-220
   Update from CVS

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

13 files changed, 132 insertions, 22 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 147ee163db8..59a0af5e2c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,72 @@
+2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (Ftranspose_regions): Yet another int/Lisp_Object mixup (YAILOM)
+
+2007-05-07  Andreas Schwab  <schwab@suse.de>
+
+        * keymap.c (Flookup_key): Fix typo in last change. 
+
+2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
+        mapping for unibyte strings.
+
+2007-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (mac_dialog_show): Apply 2007-04-27 change for xmenu.c.
+        (Fx_popup_dialog) [MAC_OSX]: Likewise.
+
+2007-04-29  Richard Stallman  <rms@gnu.org>
+
+        * insdel.c (replace_range): For undo, record insertion first.
+
+2007-04-29  Andreas Schwab  <schwab@suse.de>
+
+        * lisp.h (VECSIZE): Use OFFSETOF.
+
+2007-04-29  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (try_window_reusing_current_matrix): Fix number of
+        disabled lines.
+
+2007-04-28  Richard Stallman  <rms@gnu.org>
+
+        * lread.c (read_escape): In a string, \s is always space.
+
+2007-04-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (xdialog_show): Call Fredisplay before showing the dialog.
+
+        * gtkutil.c (xg_update_menubar, create_menus): Create empty
+        submenu for menu bar items.
+
+2007-04-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (redisplay_window): Use BEG_UNCHANGED and END_UNCHANGED
+        values of the actual window.
+
+2007-04-23  Richard Stallman  <rms@gnu.org>
+
+        * process.c (Fstart_process): Doc fix.
+
+2007-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * process.c (Fstart_process): Doc fix.
+
+2007-04-22  Richard Stallman  <rms@gnu.org>
+
+        * abbrev.c (Fdefine_abbrev): Doc fix.
+
+        * keymap.c (Fdefine_key): Minor doc fix.
+
+2007-04-21  Glenn Morris  <rgm@gnu.org>
+
+        * keymap.c (Fdefine_key): Fix info ref in doc string.
+
+2007-04-20  Glenn Morris  <rgm@gnu.org>
+
+        * sysdep.c (init_system_name): Don't accept localhost.localdomain.
+
 2007-04-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * minibuf.c (Fminibuffer_contents, Fminibuffer_contents_no_properties)
@@ -6,8 +75,8 @@
 
 2007-04-16  Chong Yidong  <cyd@stupidchicken.com>
 
-        * dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Set
-        garbaged flag in presence of window margins.
+        * dispnew.c (adjust_frame_glyphs_for_frame_redisplay):
+        Set garbaged flag in presence of window margins.
         (showing_window_margins_p): New function.
 
         * xdisp.c (cursor_row_p): Only end row on newline if it's a
diff --git a/src/abbrev.c b/src/abbrev.c
index 7dea6969f35..40cad1832fc 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -110,7 +110,7 @@ DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
 
 DEFUN ("define-abbrev", Fdefine_abbrev, Sdefine_abbrev, 3, 6, 0,
        doc: /* Define an abbrev in TABLE named NAME, to expand to EXPANSION and call HOOK.
-NAME must be a string.
+NAME must be a string, and should be lower-case.
 EXPANSION should usually be a string.
 To undefine an abbrev, define it with EXPANSION = nil.
 If HOOK is non-nil, it should be a function of no arguments;
diff --git a/src/editfns.c b/src/editfns.c
index 2ab852d2925..37498e3b6f7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4393,8 +4393,7 @@ Transposing beyond buffer boundaries is an error.  */)
       fix_start_end_in_overlays (start1, end2);
     }
 
-  signal_after_change (XINT (start1), XINT (end2 - start1),
-                       XINT (end2 - start1));
+  signal_after_change (start1, end2 - start1, end2 - start1);
   return Qnil;
 }
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 20a6e244a66..24579d7a1d1 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2192,7 +2192,9 @@ create_menus (data, f, select_cb, deactivate_cb, highlight_cb,
                                       cl_data,
                                       &group);
 
-          if (item->contents)
+          /* Create a possibly empty submenu for menu bar items, since some
+             themes don't highlight items correctly without it. */
+          if (item->contents || menu_bar_p)
             {
               GtkWidget *submenu = create_menus (item->contents,
                                                  f,
@@ -2479,8 +2481,14 @@ xg_update_menubar (menubar, f, list, iter, pos, val,
                                                  cl_data,
                                                  &group);
 
+          /* Create a possibly empty submenu for menu bar items, since some
+             themes don't highlight items correctly without it. */
+          GtkWidget *submenu = create_menus (NULL, f,
+                                             select_cb, NULL, highlight_cb,
+                                             0, 0, 0, 0, cl_data, 0);
           gtk_widget_set_name (w, MENU_ITEM_NAME);
           gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos);
+          gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu);
 
           g_list_free (*list);
           *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar));
diff --git a/src/insdel.c b/src/insdel.c
index 7f15f7de52d..65d60b6b8e3 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1603,8 +1603,12 @@ replace_range (from, to, new, prepare, inherit, markers)
 
   if (! EQ (current_buffer->undo_list, Qt))
     {
+      /* Record the insertion first, so that when we undo,
+         the deletion will be undone first.  Thus, undo
+         will insert before deleting, and thus will keep
+         the markers before and after this text separate.  */
+      record_insert (from + SCHARS (deletion), inschars);
       record_delete (from, deletion);
-      record_insert (from, inschars);
     }
 
   GAP_SIZE -= outgoing_insbytes;
diff --git a/src/keymap.c b/src/keymap.c
index a5d50b7fbf1..47e3f50786b 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1118,7 +1118,8 @@ DEF is anything that can be a key's definition:
  a cons (STRING . DEFN), meaning that DEFN is the definition
     (DEFN should be a valid definition in its own right),
  or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP,
- or an extended menu item definition.  (See info node `Extended Menu Items'.)
+ or an extended menu item definition.
+ (See info node `(elisp)Extended Menu Items'.)
 
 If KEYMAP is a sparse keymap with a binding for KEY, the existing
 binding is altered.  If there is no binding for KEY, the new pair
@@ -1148,7 +1149,8 @@ binding KEY to DEF is added at the front of KEYMAP.  */)
   if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt))
     Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands);
 
-  meta_bit = VECTORP (key) ? meta_modifier : 0x80;
+  meta_bit = (VECTORP (key) || STRINGP (key) && STRING_MULTIBYTE (key)
+              ? meta_modifier : 0x80);
 
   if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, 0)))
     { /* DEF is apparently an XEmacs-style keyboard macro.  */
@@ -1304,7 +1306,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
         c = Fevent_convert_list (c);
 
       /* Turn the 8th bit of string chars into a meta modifier.  */
-      if (INTEGERP (c) && XINT (c) & 0x80 && STRINGP (key))
+      if (STRINGP (key) && XINT (c) & 0x80 && !STRING_MULTIBYTE (key))
         XSETINT (c, (XINT (c) | meta_modifier) & ~0x80);
 
       /* Allow string since binding for `menu-bar-select-buffer'
diff --git a/src/lisp.h b/src/lisp.h
index 8a060b19941..4ae55c5519e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -735,9 +735,9 @@ struct Lisp_Vector
 
 /* If a struct is made to look like a vector, this macro returns the length
    of the shortest vector that would hold that struct.  */
-#define VECSIZE(type) ((sizeof (type) - (sizeof (struct Lisp_Vector)  \
-                                         - sizeof (Lisp_Object))      \
-                        + sizeof(Lisp_Object) - 1) /* round up */     \
+#define VECSIZE(type) ((sizeof (type)                                     \
+                        - OFFSETOF (struct Lisp_Vector, contents[0])      \
+                        + sizeof(Lisp_Object) - 1) /* round up */         \
                        / sizeof (Lisp_Object))
 
 /* Like VECSIZE, but used when the pseudo-vector has non-Lisp_Object fields
diff --git a/src/lread.c b/src/lread.c
index cc3ae7627d1..49a56a0e935 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1896,7 +1896,7 @@ read_escape (readcharfun, stringp, byterep)
 
     case 's':
       c = READCHAR;
-      if (c != '-')
+      if (stringp || c != '-')
         {
           UNREAD (c);
           return ' ';
diff --git a/src/macmenu.c b/src/macmenu.c
index c7a84df7106..a5196a156eb 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1011,6 +1011,11 @@ for instance using the window manager, then this produces a quit and
       DialogItemIndex item_hit;
       Lisp_Object tem;
 
+      /* Force a redisplay before showing the dialog.  If a frame is
+         created just before showing the dialog, its contents may not
+         have been fully drawn.  */
+      Fredisplay (Qt);
+
       tem = Fstring_match (concat3 (build_string ("\\("),
                                     call0 (intern ("sentence-end")),
                                     build_string ("\\)\n")),
@@ -2943,6 +2948,11 @@ mac_dialog_show (f, keymaps, title, header, error_name)
     first_wv = wv;
   }
 
+  /* Force a redisplay before showing the dialog.  If a frame is created
+     just before showing the dialog, its contents may not have been fully
+     drawn.  */
+  Fredisplay (Qt);
+
   /* Actually create the dialog.  */
 #if TARGET_API_MAC_CARBON
   menu_item_selection = create_and_show_dialog (f, first_wv);
diff --git a/src/process.c b/src/process.c
index 56e4335ca2c..bd12f3e1a68 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1558,13 +1558,19 @@ DEFUN ("start-process", Fstart_process, Sstart_process, 3, MANY, 0,
        doc: /* Start a program in a subprocess.  Return the process object for it.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer name) to associate with the process.
- Process output goes at end of that buffer, unless you specify
- an output stream or filter function to handle the output.
- BUFFER may be also nil, meaning that this process is not associated
- with any buffer.
+
+Process output (both standard output and standard error streams) goes
+at end of BUFFER, unless you specify an output stream or filter
+function to handle the output.  BUFFER may also be nil, meaning that
+this process is not associated with any buffer.
+
 PROGRAM is the program file name.  It is searched for in PATH.
 Remaining arguments are strings to give program as arguments.
 
+If you want to separate standard output from standard error, invoke
+the command through a shell and redirect one of them using the shell
+syntax.
+
 usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
      (nargs, args)
      int nargs;
diff --git a/src/sysdep.c b/src/sysdep.c
index 87998088753..bbaa09fbf27 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2531,7 +2531,9 @@ init_system_name ()
                 /* We still don't have a fully qualified domain name.
                    Try to find one in the list of alternate names */
                 char **alias = hp->h_aliases;
-                while (*alias && !index (*alias, '.'))
+                while (*alias
+                       && (!index (*alias, '.')
+                           || !strcmp (*alias, "localhost.localdomain")))
                   alias++;
                 if (*alias)
                   fqdn = *alias;
diff --git a/src/xdisp.c b/src/xdisp.c
index 66629f659ac..42c579f5cbb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12786,8 +12786,7 @@ redisplay_window (window, just_this_one_p)
   int rc;
   int centering_position = -1;
   int last_line_misfit = 0;
-  int save_beg_unchanged = BEG_UNCHANGED;
-  int save_end_unchanged = END_UNCHANGED;
+  int save_beg_unchanged, save_end_unchanged;
 
   SET_TEXT_POS (lpoint, PT, PT_BYTE);
   opoint = lpoint;
@@ -12852,6 +12851,9 @@ redisplay_window (window, just_this_one_p)
   set_buffer_internal_1 (XBUFFER (w->buffer));
   SET_TEXT_POS (opoint, PT, PT_BYTE);
 
+  save_beg_unchanged = BEG_UNCHANGED;
+  save_end_unchanged = END_UNCHANGED;
+
   current_matrix_up_to_date_p
     = (!NILP (w->window_end_valid)
        && !current_buffer->clip_changed
@@ -13821,7 +13823,7 @@ try_window_reusing_current_matrix (w)
                          nrows_scrolled);
 
           /* Disable lines that must be updated.  */
-          for (i = 0; i < it.vpos; ++i)
+          for (i = 0; i < nrows_scrolled; ++i)
             (start_row + i)->enabled_p = 0;
 
           /* Re-compute Y positions.  */
diff --git a/src/xmenu.c b/src/xmenu.c
index a30016e2477..228c89f9aa4 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -3375,6 +3375,14 @@ xdialog_show (f, keymaps, title, header, error_name)
   /* No selection has been chosen yet.  */
   menu_item_selection = 0;
 
+  /* Force a redisplay before showing the dialog.  If a frame is created
+     just before showing the dialog, its contents may not have been fully
+     drawn, as this depends on timing of events from the X server.  Redisplay
+     is not done when a dialog is shown.  If redisplay could be done in the
+     X event loop (i.e. the X event loop does not run in a signal handler)
+     this would not be needed.  */
+  Fredisplay (Qt);
+
   /* Actually create and show the dialog.  */
   create_and_show_dialog (f, first_wv);