diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/xsmfns.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/xsmfns.c')
| -rw-r--r-- | src/xsmfns.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/xsmfns.c b/src/xsmfns.c index 57a95607fa0..5b65e1fa2a3 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -39,9 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "termopts.h" #include "xterm.h" -/* Avoid "differ in sign" warnings */ -#define SSDATA(x) ((char *) SDATA (x)) - /* This is the event used when SAVE_SESSION_EVENT occurs. */ static struct input_event emacs_event; @@ -232,7 +229,7 @@ smc_save_yourself_CB (SmcConn smcConn, props[props_idx]->vals[2].value = NOSPLASH_OPT; cwd = get_current_dir_name (); - if (cwd) + if (cwd) { chdir_opt = xmalloc (strlen (CHDIR_OPT) + strlen (cwd) + 1); strcpy (chdir_opt, CHDIR_OPT); @@ -394,8 +391,8 @@ create_client_leader_window (struct x_display_info *dpyinfo, char *client_id) -1, -1, 1, 1, CopyFromParent, CopyFromParent, CopyFromParent); - class_hints.res_name = (char *) SDATA (Vx_resource_name); - class_hints.res_class = (char *) SDATA (Vx_resource_class); + class_hints.res_name = SSDATA (Vx_resource_name); + class_hints.res_class = SSDATA (Vx_resource_class); XSetClassHint (dpyinfo->display, w, &class_hints); XStoreName (dpyinfo->display, w, class_hints.res_name); @@ -537,10 +534,10 @@ Do not call this function yourself. */) SmcCloseConnection (smc_conn, 0, 0); ice_connection_closed (); } - + return Qnil; } - + /*********************************************************************** @@ -584,4 +581,3 @@ See also `emacs-save-session-functions', `emacs-session-save' and } #endif /* HAVE_X_SM */ - |