Mercurial > emacs

diff src/xterm.c @ 112434:9de5a68b57e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 18:56:06 -0800
parents 42e22c4f06b7
children
line wrap: on
line diff
--- a/src/xterm.c	Sat Jan 22 17:09:09 2011 -0800
+++ b/src/xterm.c	Sat Jan 22 18:56:06 2011 -0800
@@ -1365,7 +1365,7 @@
 				     glyph->u.glyphless.ch)
 		   : XCHAR_TABLE (Vglyphless_char_display)->extras[0]);
 	      if (STRINGP (acronym))
-		str = (char *) SDATA (acronym);
+		str = SSDATA (acronym);
 	    }
 	}
       else if (glyph->u.glyphless.method == GLYPHLESS_DISPLAY_HEX_CODE)
@@ -8442,7 +8442,7 @@
   for (i = 0; i < actual_size; ++i)
     {
       Atom a = ((Atom*)tmp_data)[i];
-      if (a == dpyinfo->Xatom_net_wm_state_maximized_horz) 
+      if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
         {
           if (*size_state == FULLSCREEN_HEIGHT)
             *size_state = FULLSCREEN_MAXIMIZED;
@@ -9894,7 +9894,7 @@
       {
         static char display_opt[] = "--display";
         static char name_opt[] = "--name";
-        
+
         for (argc = 0; argc < NUM_ARGV; ++argc)
           argv[argc] = 0;
 
@@ -10849,4 +10849,3 @@
 }
 
 #endif /* HAVE_X_WINDOWS */
-