Merge from mainline.

5 files changed, 58 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 912a0ae8674..c6bb161ec84 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,6 @@
 2011-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 
-        * gnutls.c (emacs_gnutls_handshake): Don't return a garbage value.
-        Expect the caller to check whether GNUTLS_STAGE_HANDSHAKE_CANDO <=
-        proc->gnutls_initstage, if the check is needed.  The check isn't
-        needed for one caller, Fgnutls_boot.  (Bug#8556)
-        (emacs_gnutls_read): Do that check.  This is the other caller.
-        (emacs_gnutls_handle_error): Remove unused local.
+        * gnutls.c (emacs_gnutls_handle_error): Remove unused local.
         (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *.
         Remove unused local.
         (emacs_gnutls_write): Don't use uninitialized rtnval if nbyte <= 0.
@@ -192,6 +187,24 @@
         alignof(EMACS_INT) < sizeof (EMACS_INT).
         (check_sblock, check_string_bytes, check_string_free_list): Protoize.
 
+2011-04-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * keyboard.c (QCrtl): Rename from Qrtl.  All uses changed.
+
+2011-04-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnutls.c (emacs_gnutls_handshake): Return an error if we're not
+        supposed to be handshaking.  (Bug#8556)
+        Reported by Paul Eggert <eggert@cs.ucla.edu>.
+
+2011-04-26  Daniel Colascione <dan.colascione@gmail.com>
+
+        * lisp.h (Qdebug): List symbol.
+        * eval.c (Qdebug): Restore global linkage.
+        * keyboard.c (debug-on-event): New variable.
+        (handle_user_signal): Break into debugger when debug-on-event
+        matches the current signal symbol.
+
 2011-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * alloc.c (check_sblock, check_string_bytes)
@@ -2710,7 +2723,7 @@
         Call gdk_x11_window_lookup_for_display.
         (xg_set_widget_bg): New function.
         (delete_cb): New function.
-        (xg_create_frame_widgets): connect delete-event to delete_cb.
+        (xg_create_frame_widgets): Connect delete-event to delete_cb.
         Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
         (xg_set_background_color): Call xg_set_widget_bg.
         (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
diff --git a/src/eval.c b/src/eval.c
index d1f327021e6..8716ad78468 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -88,7 +88,7 @@ static Lisp_Object Qdebug_on_error;
 static Lisp_Object Qdeclare;
 Lisp_Object Qinternal_interpreter_environment, Qclosure;
 
-static Lisp_Object Qdebug;
+Lisp_Object Qdebug;
 
 /* This holds either the symbol `run-hooks' or nil.
    It is nil at an early stage of startup, and when Emacs
diff --git a/src/gnutls.c b/src/gnutls.c
index 1abccbbfbee..16a459bd62f 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -73,6 +73,9 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
   gnutls_session_t state = proc->gnutls_state;
   int ret;
 
+  if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO)
+    return -1;
+
   if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET)
     {
 #ifdef WINDOWSNT
@@ -176,8 +179,7 @@ emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf,
 
   if (proc->gnutls_initstage != GNUTLS_STAGE_READY)
     {
-      if (GNUTLS_STAGE_HANDSHAKE_CANDO <= proc->gnutls_initstage)
-        emacs_gnutls_handshake (proc);
+      emacs_gnutls_handshake (proc);
       return -1;
     }
   rtnval = gnutls_read (state, buf, nbyte);
diff --git a/src/keyboard.c b/src/keyboard.c
index 86b1afc86ab..6236c42e976 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7228,12 +7228,29 @@ handle_user_signal (int sig)
 {
   int old_errno = errno;
   struct user_signal_info *p;
+  const char* special_event_name = NULL;
 
   SIGNAL_THREAD_CHECK (sig);
-
+  
+  if (SYMBOLP (Vdebug_on_event))
+    special_event_name = SDATA (SYMBOL_NAME (Vdebug_on_event));
+  
   for (p = user_signals; p; p = p->next)
     if (p->sig == sig)
       {
+        if (special_event_name &&
+            strcmp (special_event_name, p->name) == 0)
+          {
+            /* Enter the debugger in many ways.  */
+            debug_on_next_call = 1;
+            debug_on_quit = 1;
+            Vquit_flag = Qt;
+            Vinhibit_quit = Qnil;
+
+            /* Eat the event.  */
+            break;
+          }
+        
         p->npending++;
 #ifdef SIGIO
         if (interrupt_input)
@@ -7906,7 +7923,7 @@ static int ntool_bar_items;
 /* The symbols `:image' and `:rtl'.  */
 
 static Lisp_Object QCimage;
-static Lisp_Object Qrtl;
+static Lisp_Object QCrtl;
 
 /* Function prototypes.  */
 
@@ -8223,7 +8240,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
         /* Value is either a single image specification or a vector
            of 4 such specifications for the different button states.  */
         PROP (TOOL_BAR_ITEM_IMAGES) = value;
-      else if (EQ (ikey, Qrtl))
+      else if (EQ (ikey, QCrtl))
         /* ':rtl STRING' */
         PROP (TOOL_BAR_ITEM_RTL_IMAGE) = value;
     }
@@ -11458,7 +11475,7 @@ syms_of_keyboard (void)
   /* Tool-bars.  */
   DEFSYM (QCimage, ":image");
   DEFSYM (Qhelp_echo, "help-echo");
-  DEFSYM (Qrtl, ":rtl");
+  DEFSYM (QCrtl, ":rtl");
 
   staticpro (&item_properties);
   item_properties = Qnil;
@@ -12165,6 +12182,17 @@ text in the region before modifying the buffer.  The next
 `deactivate-mark' call uses this to set the window selection.  */);
   Vsaved_region_selection = Qnil;
 
+  DEFVAR_LISP ("debug-on-event",
+               Vdebug_on_event,
+               doc: /* Enter debugger on this event.  When Emacs
+receives the special event specifed by this variable, it will try to
+break into the debugger as soon as possible instead of processing the
+event normally through `special-event-map'.
+
+Currently, the only supported values for this
+variable are `sigusr1' and `sigusr2'.  */);
+  Vdebug_on_event = intern_c_string ("sigusr2");
+
   /* Create the initial keyboard. */
   initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
   init_kboard (initial_kboard);
diff --git a/src/lisp.h b/src/lisp.h
index 4b7973939ef..65b783f7b46 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2818,7 +2818,7 @@ extern void syms_of_lread (void);
 
 /* Defined in eval.c.  */
 extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
-extern Lisp_Object Qinhibit_quit, Qclosure;
+extern Lisp_Object Qinhibit_quit, Qclosure, Qdebug;
 extern Lisp_Object Qand_rest;
 extern Lisp_Object Vautoload_queue;
 extern Lisp_Object Vsignaling_function;