Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-536
   sync-tree with gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--devo--0--patch-2
   Add {arch}/=cvs-sync-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0
   Import from Gnus CVS branch V5-8

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-1
   {arch}/=tagging-method: Add CVS and autoconf grot to junk regexp

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-2
   Use explicit tags for autoconf input files

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-3
   Remove RCS keywords

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-4
   Fix copied explicit id-tags

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-5
   Add {arch}/=cvs-sync-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.8--patch-6
   configure.in: Use ifelse instead of m4_if for arch-tag: comment

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2004/gnus--rel--5.8--base-0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-1
   Gnus 5.10, from CVS branch v5-10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-2
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-3
   Use explicit tags for autoconf input files

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-4
   sync-tree with gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-5
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-6
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-7
   Remove RCS keywords

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-8
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-9
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-10
   Add {arch}/=cvs-sync-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-11
   Merge from gnus--rel--5.8

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-12
   Update from CVS: make.bat: Fix line endings around arch-tag.

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-13
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-14
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-15
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-16
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-17
   Update from CVS


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

11 files changed, 161 insertions, 52 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8fd72a29c29..bdc2d2d7e20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,57 @@
+2004-09-09  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (decode_mode_spec): Use current buffer for most purposes.
+
+2004-09-08  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (Fset_window_buffer): Doc fix.
+
+        * xdisp.c (Fformat_mode_line): New arg BUFFER says which buffer to use.
+
+2004-09-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * minibuf.c (history_delete_duplicates): New variable.
+        (read_minibuf): Use it.
+        (syms_of_minibuf): Create the corresponding lisp variable.
+
+2004-09-08  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Also look at 'cursor' property in
+        overlay just before point.
+
+2004-09-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * buffer.h (struct buffer): Add auto_save_file_format field.
+        * buffer.c (reset_buffer, init_buffer_once): Handle
+        auto_save_file_format field.
+        (syms_of_buffer): Add DEFVAR_PER_BUFFER for
+        `buffer-auto-save-file-format'.
+        * fileio.c: Delete declaration for removed Vauto_save_file_format.
+        (build_annotations): Adapt to replacement of
+        `auto-save-file-format' with the new buffer-local variable
+        `buffer-auto-save-file-format'.
+        (syms_of_fileio): Delete DEFVAR_LISP for auto-save-file-format.
+
+2004-09-07  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c.
+
+        * w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]: Handle
+        Unicode menu titles.
+
+2004-09-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Fix last change.  Only use 'cursor'
+        property from text property or overlay strings at point.
+
+2004-09-07  Stefan  <monnier@iro.umontreal.ca>
+
+        * xmenu.c (update_submenu_strings): YAILOM.
+        (set_frame_menubar): Make sure last_i is initialized.
+
 2004-09-03  Jason Rumney  <jasonr@gnu.org>
 
-        * w32menu.c (_widget_value): Added lname and lkey.
+        * w32menu.c (_widget_value): Add lname and lkey.
         (digest_single_submenu): Set lname and lkey in widget_value
         instead of name and key.
         (update_submenu_strings): New function.
@@ -12,7 +63,7 @@
         UTF-8 if Unicode API is available.
         (utf8to16): New function.
         (add_menu_item): Use it when calling Unicode API.
-        
+
 2004-09-03  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (set_cursor_from_row): Look for non-nil `cursor' property
@@ -22,14 +73,14 @@
 2004-09-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macfns.c (x_real_positions): Save the current window port and
-        set a new one before obtaining the global coordinate.  Use
-        FRAME_MAC_WINDOW.
-        (x_set_name, x_set_title): Encode title to UTF8.  Use
-        SetWindowTitleWithCFString.
+        set a new one before obtaining the global coordinate.
+        Use FRAME_MAC_WINDOW.
+        (x_set_name, x_set_title): Encode title to UTF8.
+        Use SetWindowTitleWithCFString.
         (Fx_server_version): Get correct OS version.
 
-        * macmenu.c (add_menu_item): Remove unused variable `i'.  Don't
-        let separator items destroy refence constants of other menu items.
+        * macmenu.c (add_menu_item): Remove unused variable `i'.
+        Don't let separator items destroy refence constants of other menu items.
 
         * macterm.c (x_update_end): Move SetPortWindowPort to inside
         BLOCK_INPUT.
@@ -40,8 +91,8 @@
 
         * s/darwin.h (LIBS_CARBON): New define to specify libraries for
         Carbon support.
-        (LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++.  Use
-        LIBS_CARBON.
+        (LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++.
+        Use LIBS_CARBON.
 
 2004-09-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -56,7 +107,7 @@
 
 2004-08-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * macmenu.c (_widget_value): Added lname and lkey.
+        * macmenu.c (_widget_value): Add lname and lkey.
         (single_submenu): Set lname and lkey in widget_value
         instead of name and key.
         (update_submenu_strings): New function.
diff --git a/src/buffer.c b/src/buffer.c
index bade501b1a7..c70831e155f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -694,6 +694,7 @@ reset_buffer (b)
   b->mark_active = Qnil;
   b->point_before_scroll = Qnil;
   b->file_format = Qnil;
+  b->auto_save_file_format = Qt;
   b->last_selected_window = Qnil;
   XSETINT (b->display_count, 0);
   b->display_time = Qnil;
@@ -4962,6 +4963,7 @@ init_buffer_once ()
   buffer_defaults.undo_list = Qnil;
   buffer_defaults.mark_active = Qnil;
   buffer_defaults.file_format = Qnil;
+  buffer_defaults.auto_save_file_format = Qt;
   buffer_defaults.overlays_before = NULL;
   buffer_defaults.overlays_after = NULL;
   buffer_defaults.overlay_center = BEG;
@@ -5020,6 +5022,7 @@ init_buffer_once ()
   XSETINT (buffer_local_flags.file_truename, -1);
   XSETINT (buffer_local_flags.invisibility_spec, -1);
   XSETINT (buffer_local_flags.file_format, -1);
+  XSETINT (buffer_local_flags.auto_save_file_format, -1);
   XSETINT (buffer_local_flags.display_count, -1);
   XSETINT (buffer_local_flags.display_time, -1);
   XSETINT (buffer_local_flags.enable_multibyte_characters, -1);
@@ -5830,6 +5833,13 @@ functions; it should only affect their performance.  */);
 Formats are defined by `format-alist'.  This variable is
 set when a file is visited.  */);
 
+  DEFVAR_PER_BUFFER ("buffer-auto-save-file-format",
+                     &current_buffer->auto_save_file_format, Qnil,
+                     doc: /* *Format in which to write auto-save files.
+Should be a list of symbols naming formats that are defined in `format-alist'.
+If it is t, which is the default, auto-save files are written in the
+same format as a regular save would use.  */);
+
   DEFVAR_PER_BUFFER ("buffer-invisibility-spec",
                      &current_buffer->invisibility_spec, Qnil,
                      doc: /* Invisibility spec of this buffer.
diff --git a/src/buffer.h b/src/buffer.h
index e59211d4111..bcb293a2e85 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -666,6 +666,9 @@ struct buffer
   /* List of symbols naming the file format used for visited file.  */
   Lisp_Object file_format;
 
+  /* List of symbols naming the file format used for auto-save file.  */
+  Lisp_Object auto_save_file_format;
+
   /* True if the newline position cache and width run cache are
      enabled.  See search.c and indent.c.  */
   Lisp_Object cache_long_line_scans;
diff --git a/src/fileio.c b/src/fileio.c
index 707b6e96d86..e95205d7489 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -175,9 +175,6 @@ Lisp_Object Vdefault_file_name_coding_system;
    whose I/O is done with a special handler.  */
 Lisp_Object Vfile_name_handler_alist;
 
-/* Format for auto-save files */
-Lisp_Object Vauto_save_file_format;
-
 /* Lisp functions for translating file formats */
 Lisp_Object Qformat_decode, Qformat_annotate_function;
 
@@ -5374,8 +5371,8 @@ build_annotations (start, end)
     }
 
   /* Now do the same for annotation functions implied by the file-format */
-  if (auto_saving && (!EQ (Vauto_save_file_format, Qt)))
-    p = Vauto_save_file_format;
+  if (auto_saving && (!EQ (current_buffer->auto_save_file_format, Qt)))
+    p = current_buffer->auto_save_file_format;
   else
     p = current_buffer->file_format;
   for (i = 0; CONSP (p); p = XCDR (p), ++i)
@@ -6493,13 +6490,6 @@ instead use `file-name-coding-system' to get a constant encoding
 of file names regardless of the current language environment.  */);
   Vdefault_file_name_coding_system = Qnil;
 
-  DEFVAR_LISP ("auto-save-file-format", &Vauto_save_file_format,
-    doc: /* *Format in which to write auto-save files.
-Should be a list of symbols naming formats that are defined in `format-alist'.
-If it is t, which is the default, auto-save files are written in the
-same format as a regular save would use.  */);
-  Vauto_save_file_format = Qt;
-
   Qformat_decode = intern ("format-decode");
   staticpro (&Qformat_decode);
   Qformat_annotate_function = intern ("format-annotate-function");
diff --git a/src/minibuf.c b/src/minibuf.c
index 3d2c6c3a475..a569daaefee 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -62,6 +62,10 @@ Lisp_Object Vcompletion_auto_help;
 
 Lisp_Object Qhistory_length, Vhistory_length;
 
+/* No duplicates in history.  */
+
+int history_delete_duplicates;
+
 /* Fread_minibuffer leaves the input here as a string. */
 
 Lisp_Object last_minibuf_string;
@@ -754,6 +758,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
         {
           Lisp_Object length;
 
+          if (history_delete_duplicates) Fdelete (histstring, histval);
           histval = Fcons (histstring, histval);
           Fset (Vminibuffer_history_variable, histval);
 
@@ -2673,6 +2678,12 @@ just after a new element is inserted.  Setting the history-length
 property of a history variable overrides this default.  */);
   XSETFASTINT (Vhistory_length, 30);
 
+  DEFVAR_BOOL ("history-delete-duplicates", &history_delete_duplicates,
+               doc: /* *Non-nil means to delete duplicates in history.
+If set to t when adding a new history element, all previous identical
+elements are deleted.  */);
+  history_delete_duplicates = 0;
+
   DEFVAR_LISP ("completion-auto-help", &Vcompletion_auto_help,
                doc: /* *Non-nil means automatically provide help for invalid completion input.  */);
   Vcompletion_auto_help = Qt;
diff --git a/src/w32fns.c b/src/w32fns.c
index e60385c8129..5cfc4adb0af 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -260,6 +260,7 @@ typedef BOOL (WINAPI * TrackMouseEvent_Proc)
 
 TrackMouseEvent_Proc track_mouse_event_fn = NULL;
 ClipboardSequence_Proc clipboard_sequence_fn = NULL;
+extern AppendMenuW_Proc unicode_append_menu;
 
 /* W95 mousewheel handler */
 unsigned int msh_mousewheel = 0;
@@ -3457,7 +3458,13 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
               pMis->itemHeight = GetSystemMetrics (SM_CYMENUSIZE);
               if (title)
                 {
-                  GetTextExtentPoint32 (hdc, title, strlen (title), &size);
+                  if (unicode_append_menu)
+                    GetTextExtentPoint32W (hdc, (WCHAR *) title,
+                                           wcslen ((WCHAR *) title),
+                                           &size);
+                  else
+                    GetTextExtentPoint32 (hdc, title, strlen (title), &size);
+
                   pMis->itemWidth = size.cx;
                   if (pMis->itemHeight < size.cy)
                     pMis->itemHeight = size.cy;
@@ -3495,13 +3502,22 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
                   menu_font = CreateFontIndirect (&menu_logfont);
                   old_font = SelectObject (hdc, menu_font);
 
-                  /* Always draw title as if not selected.  */
-                  ExtTextOut (hdc,
-                              pDis->rcItem.left
-                              + GetSystemMetrics (SM_CXMENUCHECK),
-                              pDis->rcItem.top,
-                              ETO_OPAQUE, &pDis->rcItem,
-                              title, strlen (title), NULL);
+                  /* Always draw title as if not selected.  */
+                  if (unicode_append_menu)
+                    ExtTextOutW (hdc,
+                                 pDis->rcItem.left
+                                 + GetSystemMetrics (SM_CXMENUCHECK),
+                                 pDis->rcItem.top,
+                                 ETO_OPAQUE, &pDis->rcItem,
+                                 (WCHAR *) title,
+                                 wcslen ((WCHAR *) title), NULL);
+                  else
+                    ExtTextOut (hdc,
+                                pDis->rcItem.left
+                                + GetSystemMetrics (SM_CXMENUCHECK),
+                                pDis->rcItem.top,
+                                ETO_OPAQUE, &pDis->rcItem,
+                                title, strlen (title), NULL);
 
                   SelectObject (hdc, old_font);
                   DeleteObject (menu_font);
diff --git a/src/w32menu.c b/src/w32menu.c
index f3f3eb785b0..4553895d829 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -143,11 +143,6 @@ typedef BOOL (WINAPI * SetMenuItemInfoA_Proc) (
     IN UINT,
     IN BOOL,
     IN LPCMENUITEMINFOA);
-typedef BOOL (WINAPI * AppendMenuW_Proc) (
-    IN HMENU,
-    IN UINT,
-    IN UINT_PTR,
-    IN LPCWSTR);
 
 GetMenuItemInfoA_Proc get_menu_item_info = NULL;
 SetMenuItemInfoA_Proc set_menu_item_info = NULL;
diff --git a/src/w32term.h b/src/w32term.h
index 284458d4270..ca843ddbfb2 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -736,6 +736,11 @@ EXFUN (Fx_display_grayscale_p, 1);
       ? BDF_1D_FONT : BDF_2D_FONT))
 
 typedef DWORD (WINAPI * ClipboardSequence_Proc) ();
+typedef BOOL (WINAPI * AppendMenuW_Proc) (
+    IN HMENU,
+    IN UINT,
+    IN UINT_PTR,
+    IN LPCWSTR);
 
 /* arch-tag: f201d05a-1240-4fc5-8ea4-ca24d4ee5671
    (do not change this comment) */
diff --git a/src/window.c b/src/window.c
index 8a704bdc298..c64e8557b56 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3059,7 +3059,9 @@ BUFFER can be a buffer or the name of an existing buffer.
 Optional third arg KEEP-MARGINS non-nil means that WINDOW's current
 display margins, fringe widths, and scroll bar settings are maintained;
 the default is to reset these from BUFFER's local settings or the frame
-defaults.  */)
+defaults.
+
+This function runs the hook `window-scroll-functions'.  */)
      (window, buffer, keep_margins)
      register Lisp_Object window, buffer, keep_margins;
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 6a12cb57551..9953e65d070 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10655,6 +10655,7 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
   int string_before_pos;
   int x = row->x;
   int cursor_x = x;
+  int cursor_from_overlay_pos = 0;
   int pt_old = PT - delta;
 
   /* Skip over glyphs not having an object at the start of the row.
@@ -10680,6 +10681,12 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           string_start = NULL;
           x += glyph->pixel_width;
           ++glyph;
+          if (cursor_from_overlay_pos
+              && last_pos > cursor_from_overlay_pos)
+            {
+              cursor_from_overlay_pos = 0;
+              cursor = 0;
+            }
         }
       else
         {
@@ -10689,10 +10696,21 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
           /* Skip all glyphs from string.  */
           do
             {
+              int pos;
               if ((cursor == NULL || glyph > cursor)
                   && !NILP (Fget_char_property (make_number ((glyph)->charpos),
-                                                Qcursor, (glyph)->object)))
+                                                Qcursor, (glyph)->object))
+                  && (pos = string_buffer_position (w, glyph->object,
+                                                    string_before_pos),
+                      (pos == 0   /* From overlay */
+                       || pos == pt_old)))
                 {
+                  /* Estimate overlay buffer position from the buffer
+                     positions of the glyphs before and after the overlay.
+                     Add 1 to last_pos so that if point corresponds to the
+                     glyph right after the overlay, we still use a 'cursor'
+                     property found in that overlay.  */
+                  cursor_from_overlay_pos = pos == 0 ? last_pos+1 : 0;
                   cursor = glyph;
                   cursor_x = x;
                 }
@@ -15775,15 +15793,16 @@ store_mode_line_string (string, lisp_string, copy_string, field_width, precision
 
 
 DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
-       0, 3, 0,
+       0, 4, 0,
        doc: /* Return the mode-line of selected window as a string.
 First optional arg FORMAT specifies a different format string (see
 `mode-line-format' for details) to use.  If FORMAT is t, return
 the buffer's header-line.  Second optional arg WINDOW specifies a
 different window to use as the context for the formatting.
-If third optional arg NO-PROPS is non-nil, string is not propertized.  */)
-     (format, window, no_props)
-     Lisp_Object format, window, no_props;
+If third optional arg NO-PROPS is non-nil, string is not propertized.
+Fourth optional arg BUFFER specifies which buffer to use.  */)
+  (format, window, no_props, buffer)
+     Lisp_Object format, window, no_props, buffer;
 {
   struct it it;
   int len;
@@ -15795,12 +15814,16 @@ If third optional arg NO-PROPS is non-nil, string is not propertized.  */)
     window = selected_window;
   CHECK_WINDOW (window);
   w = XWINDOW (window);
-  CHECK_BUFFER (w->buffer);
 
-  if (XBUFFER (w->buffer) != current_buffer)
+  if (NILP (buffer))
+    buffer = w->buffer;
+
+  CHECK_BUFFER (buffer);
+
+  if (XBUFFER (buffer) != current_buffer)
     {
       old_buffer = current_buffer;
-      set_buffer_internal_1 (XBUFFER (w->buffer));
+      set_buffer_internal_1 (XBUFFER (buffer));
     }
 
   if (NILP (format) || EQ (format, Qt))
@@ -16103,7 +16126,10 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
    generated by character C.  PRECISION >= 0 means don't return a
    string longer than that value.  FIELD_WIDTH > 0 means pad the
    string returned with spaces to that value.  Return 1 in *MULTIBYTE
-   if the result is multibyte text.  */
+   if the result is multibyte text.
+
+   Note we operate on the current buffer for most purposes,
+   the exception being w->base_line_pos.  */
 
 static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------";
 
@@ -16117,7 +16143,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
   Lisp_Object obj;
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   char *decode_mode_spec_buf = f->decode_mode_spec_buffer;
-  struct buffer *b = XBUFFER (w->buffer);
+  struct buffer *b = current_buffer;
 
   obj = Qnil;
   *multibyte = 0;
@@ -16419,7 +16445,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
 
     case 's':
       /* status of process */
-      obj = Fget_buffer_process (w->buffer);
+      obj = Fget_buffer_process (Fcurrent_buffer ());
       if (NILP (obj))
         return "no process";
 #ifdef subprocesses
diff --git a/src/xmenu.c b/src/xmenu.c
index aa963935262..5c3d5804355 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,5 +1,5 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001, 2003
+   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1801,7 +1801,7 @@ update_submenu_strings (first_wv)
 
   for (wv = first_wv; wv; wv = wv->next)
     {
-      if (wv->lname && ! NILP (wv->lname))
+      if (STRINGP (wv->lname))
         {
           wv->name = SDATA (wv->lname);
 
@@ -1815,7 +1815,7 @@ update_submenu_strings (first_wv)
             }
         }
 
-      if (wv->lkey && ! NILP (wv->lkey))
+      if (STRINGP (wv->lkey))
         wv->key = SDATA (wv->lkey);
 
       if (wv->contents)
@@ -1888,7 +1888,7 @@ set_frame_menubar (f, first_time, deep_p)
 #endif
   Lisp_Object items;
   widget_value *wv, *first_wv, *prev_wv = 0;
-  int i, last_i;
+  int i, last_i = 0;
   int *submenu_start, *submenu_end;
   int *submenu_top_level_items, *submenu_n_panes;