Add bug number.

6 files changed, 67 insertions, 31 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 98489e1d71d..e1d2ba440ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2010-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (event_handler_gdk): Block input (Bug#5037).
+
+2010-01-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs.c (standard_args): Adjust arg priorities to reflect how
+        they are processed in startup.el.
+
+2010-01-16  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (lisp, shortlisp): Update.
+
+2010-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xterm.c (x_term_init): Instead of inhibiting GC while running Lisp
+        code, link the new kboard into all_kboard before running Lisp code,
+        and protect the new terminal with GCPRO (Bug#5365).
+        (x_term_init): Remove unused var `atom'.
+        (x_delete_display, x_delete_terminal): Remove unused var `i'.
+
 2010-01-15  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xfns.c (x_get_current_desktop, x_get_desktop_workarea): New functions.
diff --git a/src/Makefile.in b/src/Makefile.in
index 1fd3a3ffe85..11facec6023 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -736,13 +736,13 @@ lisp= \
         ${lispsource}emacs-lisp/map-ynp.elc \
         ${lispsource}menu-bar.elc \
         ${lispsource}international/mule.elc \
-        ${lispsource}international/mule-conf.el \
+        ${lispsource}international/mule-conf.elc \
         ${lispsource}international/mule-cmds.elc \
         ${lispsource}international/characters.elc \
         ${lispsource}international/charprop.el \
         ${lispsource}case-table.elc \
-        ${lispsource}language/chinese.el \
-        ${lispsource}language/cyrillic.el \
+        ${lispsource}language/chinese.elc \
+        ${lispsource}language/cyrillic.elc \
         ${lispsource}language/indian.elc \
         ${lispsource}language/sinhala.el \
         ${lispsource}language/english.el \
@@ -760,7 +760,7 @@ lisp= \
         ${lispsource}language/tai-viet.el \
         ${lispsource}language/thai.el \
         ${lispsource}language/tibetan.elc \
-        ${lispsource}language/vietnamese.el \
+        ${lispsource}language/vietnamese.elc \
         ${lispsource}language/misc-lang.el \
         ${lispsource}language/utf-8-lang.el \
         ${lispsource}language/georgian.el \
@@ -829,12 +829,12 @@ shortlisp= \
         ../lisp/emacs-lisp/map-ynp.elc \
         ../lisp/env.elc \
         ../lisp/international/mule.elc \
-        ../lisp/international/mule-conf.el \
+        ../lisp/international/mule-conf.elc \
         ../lisp/international/mule-cmds.elc \
         ../lisp/international/characters.elc \
         ../lisp/case-table.elc \
-        ../lisp/language/chinese.el \
-        ../lisp/language/cyrillic.el \
+        ../lisp/language/chinese.elc \
+        ../lisp/language/cyrillic.elc \
         ../lisp/language/indian.elc \
         ../lisp/language/sinhala.el \
         ../lisp/language/english.el \
@@ -852,7 +852,7 @@ shortlisp= \
         ../lisp/language/tai-viet.el \
         ../lisp/language/thai.el \
         ../lisp/language/tibetan.elc \
-        ../lisp/language/vietnamese.el \
+        ../lisp/language/vietnamese.elc \
         ../lisp/language/misc-lang.el \
         ../lisp/language/utf-8-lang.el \
         ../lisp/language/georgian.el \
diff --git a/src/atimer.h b/src/atimer.h
index 5ea1197e66d..fd354caf54d 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -43,7 +43,7 @@ enum atimer_type
   /* Timer is ripe at now plus an offset.  */
   ATIMER_RELATIVE,
 
-  /* Timer runs continously.  */
+  /* Timer runs continuously.  */
   ATIMER_CONTINUOUS
 };
 
diff --git a/src/emacs.c b/src/emacs.c
index 2f73e8b837a..71ffa998bfe 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1869,7 +1869,7 @@ const struct standard_args standard_args[] =
   /* -d must come last before the options handled in startup.el.  */
   { "-d", "--display", 60, 1 },
   { "-display", 0, 60, 1 },
-  /* Now for the options handled in startup.el.  */
+  /* Now for the options handled in `command-line' (startup.el).  */
   { "-Q", "--quick", 55, 0 },
   { "-quick", 0, 55, 0 },
   { "-q", "--no-init-file", 50, 0 },
@@ -1878,10 +1878,12 @@ const struct standard_args standard_args[] =
   { "-u", "--user", 30, 1 },
   { "-user", 0, 30, 1 },
   { "-debug-init", "--debug-init", 20, 0 },
-  { "-nbi", "--no-bitmap-icon", 15, 0 },
   { "-iconic", "--iconic", 15, 0 },
   { "-D", "--basic-display", 12, 0},
   { "-basic-display", 0, 12, 0},
+  { "-nbc", "--no-blinking-cursor", 12, 0 },
+  /* Now for the options handled in `command-line-1' (startup.el).  */
+  { "-nbi", "--no-bitmap-icon", 10, 0 },
   { "-bg", "--background-color", 10, 1 },
   { "-background", 0, 10, 1 },
   { "-fg", "--foreground-color", 10, 1 },
@@ -1891,7 +1893,6 @@ const struct standard_args standard_args[] =
   { "-ib", "--internal-border", 10, 1 },
   { "-ms", "--mouse-color", 10, 1 },
   { "-cr", "--cursor-color", 10, 1 },
-  { "-nbc", "--no-blinking-cursor", 10, 0 },
   { "-fn", "--font", 10, 1 },
   { "-font", 0, 10, 1 },
   { "-fs", "--fullscreen", 10, 0 },
diff --git a/src/xdisp.c b/src/xdisp.c
index ef9c7453d75..7d43f2d8bef 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,7 +1,8 @@
 /* Display generation from window structure and buffer text.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008, 2009, 2010
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xterm.c b/src/xterm.c
index 72dff200d82..1add3c415e7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5797,6 +5797,7 @@ event_handler_gdk (gxev, ev, data)
 {
   XEvent *xev = (XEvent *) gxev;
 
+  BLOCK_INPUT;
   if (current_count >= 0)
     {
       struct x_display_info *dpyinfo;
@@ -5807,23 +5808,27 @@ event_handler_gdk (gxev, ev, data)
       /* Filter events for the current X input method.
          GTK calls XFilterEvent but not for key press and release,
          so we do it here.  */
-      if (xev->type == KeyPress || xev->type == KeyRelease)
-        if (dpyinfo && x_filter_event (dpyinfo, xev))
-          return GDK_FILTER_REMOVE;
+      if ((xev->type == KeyPress || xev->type == KeyRelease)
+          && dpyinfo
+          && x_filter_event (dpyinfo, xev))
+        {
+          UNBLOCK_INPUT;
+          return GDK_FILTER_REMOVE;
+        }
 #endif
 
       if (! dpyinfo)
         current_finish = X_EVENT_NORMAL;
       else
-        {
-          current_count +=
-            handle_one_xevent (dpyinfo, xev, &current_finish,
-                               current_hold_quit);
-        }
+        current_count +=
+          handle_one_xevent (dpyinfo, xev, &current_finish,
+                             current_hold_quit);
     }
   else
     current_finish = x_dispatch_event (xev, xev->xany.display);
 
+  UNBLOCK_INPUT;
+
   if (current_finish == X_EVENT_GOTO_OUT || current_finish == X_EVENT_DROP)
     return GDK_FILTER_REMOVE;
 
@@ -9821,7 +9826,7 @@ x_wm_set_icon_pixmap (f, pixmap_id)
 {
   Pixmap icon_pixmap, icon_mask;
 
-#ifndef USE_X_TOOLKIT
+#if !defined USE_X_TOOLKIT && !defined USE_GTK
   Window window = FRAME_OUTER_WINDOW (f);
 #endif
 
@@ -10076,7 +10081,6 @@ x_term_init (display_name, xrm_option, resource_name)
     int argc;
     char *argv[NUM_ARGV];
     char **argv2 = argv;
-    GdkAtom atom;
     guint id;
 #ifndef HAVE_GTK_MULTIDISPLAY
     if (!EQ (Vinitial_window_system, Qx))
@@ -10215,25 +10219,36 @@ x_term_init (display_name, xrm_option, resource_name)
         terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
         init_kboard (terminal->kboard);
         terminal->kboard->Vwindow_system = Qx;
+
+        /* Add the keyboard to the list before running Lisp code (via
+           Qvendor_specific_keysyms below), since these are not traced
+           via terminals but only through all_kboards.  */
+        terminal->kboard->next_kboard = all_kboards;
+        all_kboards = terminal->kboard;
+
         if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound))
           {
             char *vendor = ServerVendor (dpy);
-            /* Temporarily hide the partially initialized terminal,
-               but make sure it doesn't get garbage collected.  */
-            int count = inhibit_garbage_collection ();
+
+            /* Protect terminal from GC before removing it from the
+               list of terminals.  */
+            struct gcpro gcpro1;
+            Lisp_Object gcpro_term;
+            XSETTERMINAL (gcpro_term, terminal);
+            GCPRO1 (gcpro_term);
+
+            /* Temporarily hide the partially initialized terminal.  */
             terminal_list = terminal->next_terminal;
             UNBLOCK_INPUT;
             terminal->kboard->Vsystem_key_alist
               = call1 (Qvendor_specific_keysyms,
                        vendor ? build_string (vendor) : empty_unibyte_string);
             BLOCK_INPUT;
-            unbind_to (count, Qnil);
             terminal->next_terminal = terminal_list;
             terminal_list = terminal;
+            UNGCPRO;
           }
 
-        terminal->kboard->next_kboard = all_kboards;
-        all_kboards = terminal->kboard;
         /* Don't let the initial kboard remain current longer than necessary.
            That would cause problems if a file loaded on startup tries to
            prompt in the mini-buffer.  */
@@ -10582,7 +10597,6 @@ void
 x_delete_display (dpyinfo)
      struct x_display_info *dpyinfo;
 {
-  int i;
   struct terminal *t;
 
   /* Close all frames and delete the generic struct terminal for this
@@ -10734,7 +10748,6 @@ void
 x_delete_terminal (struct terminal *terminal)
 {
   struct x_display_info *dpyinfo = terminal->display_info.x;
-  int i;
 
   /* Protect against recursive calls.  delete_frame in
      delete_terminal calls us back when it deletes our last frame.  */