2 files changed, 7 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c6bb161ec84..5c04f32b194 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * keyboard.c (handle_user_signal): Fix pointer signedness problem.
+
         * gnutls.c (emacs_gnutls_handle_error): Remove unused local.
         (Fgnutls_boot): gnutls_certificate_verify_peers2 wants unsigned *.
         Remove unused local.
diff --git a/src/keyboard.c b/src/keyboard.c
index 6236c42e976..fac098ddffd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7228,13 +7228,13 @@ handle_user_signal (int sig)
 {
   int old_errno = errno;
   struct user_signal_info *p;
-  const char* special_event_name = NULL;
+  const char *special_event_name = NULL;
 
   SIGNAL_THREAD_CHECK (sig);
-  
+
   if (SYMBOLP (Vdebug_on_event))
-    special_event_name = SDATA (SYMBOL_NAME (Vdebug_on_event));
-  
+    special_event_name = SSDATA (SYMBOL_NAME (Vdebug_on_event));
+
   for (p = user_signals; p; p = p->next)
     if (p->sig == sig)
       {
@@ -7250,7 +7250,7 @@ handle_user_signal (int sig)
             /* Eat the event.  */
             break;
           }
-        
+
         p->npending++;
 #ifdef SIGIO
         if (interrupt_input)