diff options
| author | Joakim Verona | 2013-08-14 18:51:46 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-14 18:51:46 +0200 |
| commit | 1cd3338c8c8074c0c93c997e4430d441fdec4113 (patch) | |
| tree | d18dfd08c22a10c375c89f9b66698d10d14cdce6 /src/xterm.c | |
| parent | ef7cb56e57e53af78783a85df167f943bd5fe039 (diff) | |
| parent | 5b71542de3ef7f08b7c30e93340502d7cc120910 (diff) | |
| download | emacs-1cd3338c8c8074c0c93c997e4430d441fdec4113.tar.gz emacs-1cd3338c8c8074c0c93c997e4430d441fdec4113.zip | |
merge from trunk
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index 7b42e858304..703fc3cc566 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10056,9 +10056,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10056 | dpyinfo->display = dpy; | 10056 | dpyinfo->display = dpy; |
| 10057 | 10057 | ||
| 10058 | /* Set the name of the terminal. */ | 10058 | /* Set the name of the terminal. */ |
| 10059 | terminal->name = xmalloc (SBYTES (display_name) + 1); | 10059 | terminal->name = xlispstrdup (display_name); |
| 10060 | memcpy (terminal->name, SSDATA (display_name), SBYTES (display_name)); | ||
| 10061 | terminal->name[SBYTES (display_name)] = 0; | ||
| 10062 | 10060 | ||
| 10063 | #if 0 | 10061 | #if 0 |
| 10064 | XSetAfterFunction (x_current_display, x_trace_wire); | 10062 | XSetAfterFunction (x_current_display, x_trace_wire); |