Merged from miles@gnu.org--gnu-2005 (patch 204-213)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-204
   Clean up gdb-ui breakpoint faces

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

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

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

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

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

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

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

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

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

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

12 files changed, 174 insertions, 48 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2354e597844..4ea174bdc60 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2005-03-26  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+        * w32term.h (x_output): add focus_state.
+
+        * w32term.c (x_focus_changed, w32_detect_focus_change): New functions.
+        (w32_read_socket) [WM_SETFOCUS]: Call w32_detect_focus_change.
+
+2005-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (Fminibuffer_complete_and_exit, Fself_insert_and_exit):
+        Use Fexit_minibuffer.
+        (Fexit_minibuffer): Mark it as no-return, deactivate the mark.
+
+2005-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.c (Ffile_attributes): Add a missing gcpro.
+
+        * alloc.c (make_number): The arg can be bigger than `int'.
+        * lisp.h (make_number): Make prototype more precise.
+
+        * process.c, dired.c (Vfile_name_coding_system)
+        (Vdefault_file_name_coding_system):
+        * callproc.c (Vdoc_file_name, Vfile_name_coding_system)
+        (Vdefault_file_name_coding_system): Remove unused declarations.
+
+2005-03-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (create_and_show_popup_menu): Just remove menu and return
+        if it failed to pop up (Gnome "show pointer on ctrl" option makes
+        menus fail to pop up).
+
+2005-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (get_next_display_element): Also use `\ ' & `\-' for latin-9.
+        Just prepend a backslash without replacing the NBSP by an SPC.
+
 2005-03-22  Kim F. Storm  <storm@cua.dk>
 
         * xfaces.c (lookup_derived_face): Add arg SIGNAL_P.
@@ -17,7 +53,7 @@
 2005-03-22  David Kastrup  <dak@gnu.org>
 
         * textprop.c (Fnext_char_property_change)
-        (Fprevious_char_property_change): allow marker as limit.
+        (Fprevious_char_property_change): Allow marker as limit.
         (Fnext_single_char_property_change)
         (Fprevious_single_char_property_change): Check that limit is a
         number in strings.
@@ -51,8 +87,7 @@
 
 2005-03-17  Kenichi Handa  <handa@m17n.org>
 
-        * coding.c (syms_of_coding): Docstring of coding-category-list
-        fixed.
+        * coding.c (syms_of_coding): Docstring of coding-category-list fixed.
 
 2005-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/src/alloc.c b/src/alloc.c
index 093919fee3d..dbb77f77128 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1503,7 +1503,7 @@ mark_interval_tree (tree)
 #ifndef make_number
 Lisp_Object
 make_number (n)
-     int n;
+     EMACS_INT n;
 {
   Lisp_Object obj;
   obj.s.val = n;
diff --git a/src/callproc.c b/src/callproc.c
index e251fc65941..6027ccdda9f 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
-   Copyright (C) 1985,86,87,88,93,94,95,99, 2000,01,02,03,04
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
+     2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -130,10 +130,6 @@ int synch_process_termsig;
 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
 int synch_process_retcode;
-
-extern Lisp_Object Vdoc_file_name;
-
-extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;
 
 /* Clean up when exiting Fcall_process.
    On MSDOS, delete the temporary file on any kind of termination.
diff --git a/src/coding.c b/src/coding.c
index 6a3868b016d..3b6b82aeea4 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7821,8 +7821,7 @@ associated with each coding-category one by one in this order.  When
 one algorithm agrees with a byte sequence of source text, the coding
 system bound to the corresponding coding-category is selected.
 
-When you modify this variable, `update-coding-systems-internal' must
-be called.  */);
+Don't modify this variable directly, but use `set-coding-category'.  */);
   {
     int i;
 
diff --git a/src/dired.c b/src/dired.c
index e833ceb216b..62bf4beb384 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1,5 +1,5 @@
 /* Lisp functions for making directory listings.
-   Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2004
+   Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2004, 2005
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -114,7 +114,6 @@ extern void filemodestring P_ ((struct stat *, char *));
 
 extern int completion_ignore_case;
 extern Lisp_Object Vcompletion_regexp_list;
-extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;
 
 Lisp_Object Vcompletion_ignored_extensions;
 Lisp_Object Qcompletion_ignore_case;
@@ -907,6 +906,7 @@ Elements of the attribute list are:
 #endif
   char modes[10];
   Lisp_Object handler;
+  struct gcpro gcpro1;
 
   filename = Fexpand_file_name (filename, Qnil);
 
@@ -922,7 +922,9 @@ Elements of the attribute list are:
         return call3 (handler, Qfile_attributes, filename, id_format);
     }
 
+  GCPRO1 (filename);
   encoded = ENCODE_FILE (filename);
+  UNGCPRO;
 
   if (lstat (SDATA (encoded), &s) < 0)
     return Qnil;
diff --git a/src/lisp.h b/src/lisp.h
index f677eee0953..f770a29cf4f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985,86,87,93,94,95,97,98,1999,2000,01,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.
 
@@ -451,7 +451,7 @@ enum pvec_type
 #define make_number(N) \
   (__extension__ ({ Lisp_Object _l; _l.s.val = (N); _l.s.type = Lisp_Int; _l; }))
 #else
-extern Lisp_Object make_number ();
+extern Lisp_Object make_number P_ ((EMACS_INT));
 #endif
 
 #define EQ(x, y) ((x).s.val == (y).s.val && (x).s.type == (y).s.type)
diff --git a/src/minibuf.c b/src/minibuf.c
index b45e804feb5..85cee34420c 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1,5 +1,5 @@
 /* Minibuffer input and completion.
-   Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03,04
+   Copyright (C) 1985,86,93,94,95,96,97,98,99,2000,01,03,04,05
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2085,6 +2085,8 @@ complete_and_exit_2 (ignore)
   return make_number (1);
 }
 
+EXFUN (Fexit_minibuffer, 0) NO_RETURN;
+
 DEFUN ("minibuffer-complete-and-exit", Fminibuffer_complete_and_exit,
        Sminibuffer_complete_and_exit, 0, 0, "",
        doc: /* If the minibuffer contents is a valid completion then exit.
@@ -2147,7 +2149,7 @@ a repetition of this command will exit.  */)
       return Qnil;
     }
  exit:
-  return Fthrow (Qexit, Qnil);
+  return Fexit_minibuffer ();
   /* NOTREACHED */
 }
 
@@ -2554,14 +2556,21 @@ DEFUN ("self-insert-and-exit", Fself_insert_and_exit, Sself_insert_and_exit, 0,
   else
     bitch_at_user ();
 
-  return Fthrow (Qexit, Qnil);
+  return Fexit_minibuffer ();
 }
 
 DEFUN ("exit-minibuffer", Fexit_minibuffer, Sexit_minibuffer, 0, 0, "",
        doc: /* Terminate this minibuffer argument.  */)
      ()
 {
-  return Fthrow (Qexit, Qnil);
+  /* If the command that uses this has made modifications in the minibuffer,
+     we don't want them to cause deactivation of the mark in the original
+     buffer.
+     A better solution would be to make deactivate-mark buffer-local
+     (or to turn it into a list of buffers, ...), but in the mean time,
+     this should do the trick in most cases.  */
+  Vdeactivate_mark = Qnil;
+  Fthrow (Qexit, Qnil);
 }
 
 DEFUN ("minibuffer-depth", Fminibuffer_depth, Sminibuffer_depth, 0, 0, 0,
diff --git a/src/process.c b/src/process.c
index 9e4122a85b3..c6a9b255243 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,6 +1,6 @@
 /* Asynchronous subprocess control for GNU Emacs.
-   Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 98, 1999,
-      2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1998, 1999,
+      2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -376,8 +376,6 @@ extern int timers_run;
 /* Maximum number of bytes to send to a pty without an eof.  */
 static int pty_max_bytes;
 
-extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;
-
 #ifdef HAVE_PTYS
 #ifdef HAVE_PTY_H
 #include <pty.h>
diff --git a/src/w32term.c b/src/w32term.c
index 93eabd9d0ad..403cec7db7e 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -255,6 +255,10 @@ static void frame_highlight P_ ((struct frame *));
 static void frame_unhighlight P_ ((struct frame *));
 static void x_new_focus_frame P_ ((struct w32_display_info *,
                                    struct frame *));
+static void x_focus_changed P_ ((int, int, struct w32_display_info *,
+                                  struct frame *, struct input_event *));
+static void w32_detect_focus_change P_ ((struct w32_display_info *,
+                                       W32Msg *, struct input_event *));
 static void w32_frame_rehighlight P_ ((struct frame *));
 static void x_frame_rehighlight P_ ((struct w32_display_info *));
 static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *));
@@ -2816,6 +2820,81 @@ x_new_focus_frame (dpyinfo, frame)
   x_frame_rehighlight (dpyinfo);
 }
 
+
+/* Handle FocusIn and FocusOut state changes for FRAME.
+   If FRAME has focus and there exists more than one frame, puts
+   a FOCUS_IN_EVENT into *BUFP.  */
+
+static void
+x_focus_changed (type, state, dpyinfo, frame, bufp)
+     int type;
+     int state;
+     struct w32_display_info *dpyinfo;
+     struct frame *frame;
+     struct input_event *bufp;
+{
+  if (type == WM_SETFOCUS)
+    {
+      if (dpyinfo->w32_focus_event_frame != frame)
+        {
+          x_new_focus_frame (dpyinfo, frame);
+          dpyinfo->w32_focus_event_frame = frame;
+
+          /* Don't stop displaying the initial startup message
+             for a switch-frame event we don't need.  */
+          if (GC_NILP (Vterminal_frame)
+              && GC_CONSP (Vframe_list)
+              && !GC_NILP (XCDR (Vframe_list)))
+            {
+              bufp->kind = FOCUS_IN_EVENT;
+              XSETFRAME (bufp->frame_or_window, frame);
+            }
+        }
+
+      frame->output_data.x->focus_state |= state;
+
+      /* TODO: IME focus?  */
+    }
+  else if (type == WM_KILLFOCUS)
+    {
+      frame->output_data.x->focus_state &= ~state;
+
+      if (dpyinfo->w32_focus_event_frame == frame)
+        {
+          dpyinfo->w32_focus_event_frame = 0;
+          x_new_focus_frame (dpyinfo, 0);
+        }
+
+      /* TODO: IME focus?  */
+    }
+}
+
+
+/* The focus may have changed.  Figure out if it is a real focus change,
+   by checking both FocusIn/Out and Enter/LeaveNotify events.
+
+   Returns FOCUS_IN_EVENT event in *BUFP. */
+
+static void
+w32_detect_focus_change (dpyinfo, event, bufp)
+     struct w32_display_info *dpyinfo;
+     W32Msg *event;
+     struct input_event *bufp;
+{
+  struct frame *frame;
+
+  frame = x_any_window_to_frame (dpyinfo, event->msg.hwnd);
+  if (! frame)
+    return;
+
+  /* On w32, this is only called from focus events, so no switch needed.  */
+  x_focus_changed (event->msg.message,
+                   (event->msg.message == WM_KILLFOCUS ?
+                    FOCUS_IMPLICIT : FOCUS_EXPLICIT),
+                   dpyinfo, frame, bufp);
+}
+
+
 /* Handle an event saying the mouse has moved out of an Emacs frame.  */
 
 void
@@ -4660,27 +4739,13 @@ w32_read_socket (sd, expected, hold_quit)
           break;
 
         case WM_SETFOCUS:
-          /* TODO: Port this change:
-             2002-06-28  Jan D.  <jan.h.d@swipnet.se>
-             * xterm.h (struct x_output): Add focus_state.
-             * xterm.c (x_focus_changed): New function.
-             (x_detect_focus_change): New function.
-             (XTread_socket): Call x_detect_focus_change for FocusIn/FocusOut
-             EnterNotify and LeaveNotify to track X focus changes.
-          */
-          f = x_any_window_to_frame (dpyinfo, msg.msg.hwnd);
-
-          dpyinfo->w32_focus_event_frame = f;
-
-          if (f)
-            x_new_focus_frame (dpyinfo, f);
+          w32_detect_focus_change (dpyinfo, &msg, &inev);
 
           dpyinfo->grabbed = 0;
           check_visibility = 1;
           break;
 
         case WM_KILLFOCUS:
-          /* TODO: some of this belongs in MOUSE_LEAVE */
           f = x_top_window_to_frame (dpyinfo, msg.msg.hwnd);
 
           if (f)
diff --git a/src/w32term.h b/src/w32term.h
index ca843ddbfb2..db7e6760ee6 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -276,8 +276,25 @@ struct x_output
 {
   PIX_TYPE background_pixel;
   PIX_TYPE foreground_pixel;
+
+  /* Keep track of focus.  May be EXPLICIT if we received a FocusIn for this
+     frame, or IMPLICIT if we received an EnterNotify.
+     FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
+  int focus_state;
+
 };
 
+enum
+{
+  /* Values for focus_state, used as bit mask.
+     EXPLICIT means we received a FocusIn for the frame and know it has
+     the focus.  IMPLICIT means we recevied an EnterNotify and the frame
+     may have the focus if no window manager is running.
+     FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
+  FOCUS_NONE     = 0,
+  FOCUS_IMPLICIT = 1,
+  FOCUS_EXPLICIT = 2
+};
 
 struct w32_output
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 68aeae2aea0..bfb6ba5bf4c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5071,7 +5071,8 @@ get_next_display_element (it)
                            && it->len == 1)
                           || !CHAR_PRINTABLE_P (it->c)
                           || (!NILP (Vshow_nonbreak_escape)
-                              && (it->c == 0x8ad || it->c == 0x8a0)))
+                              && (it->c == 0x8ad || it->c == 0x8a0
+                                  || it->c == 0xf2d || it->c == 0xf20)))
                        : (it->c >= 127
                           && (!unibyte_display_via_language_environment
                               || it->c == unibyte_char_to_multibyte (it->c)))))
@@ -5138,10 +5139,11 @@ get_next_display_element (it)
                                          it->face_id);
                 }
 
-              if (it->c == 0x8a0 || it->c == 0x8ad)
+              if (it->c == 0x8a0 || it->c == 0x8ad
+                  || it->c == 0xf20 || it->c == 0xf2d)
                 {
                   XSETINT (it->ctl_chars[0], escape_glyph);
-                  g = it->c == 0x8ad ? '-' : ' ';
+                  g = it->c;
                   XSETINT (it->ctl_chars[1], g);
                   ctl_len = 2;
                   goto display_control;
diff --git a/src/xmenu.c b/src/xmenu.c
index ad41387b4a6..b29b74b6e44 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2490,11 +2490,14 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
 
   record_unwind_protect (pop_down_menu, make_save_value (menu, 0));
 
-  /* Set this to one.  popup_widget_loop increases it by one, so it becomes
-     two.  show_help_echo uses this to detect popup menus.  */
-  popup_activated_flag = 1;
-  /* Process events that apply to the menu.  */
-  popup_widget_loop (1, menu);
+  if (GTK_WIDGET_MAPPED (menu))
+    {
+      /* Set this to one.  popup_widget_loop increases it by one, so it becomes
+         two.  show_help_echo uses this to detect popup menus.  */
+      popup_activated_flag = 1;
+      /* Process events that apply to the menu.  */
+      popup_widget_loop (1, menu);
+    }
 
   unbind_to (specpdl_count, Qnil);