diff options
| author | Joakim Verona | 2010-09-06 11:56:58 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-09-06 11:56:58 +0200 |
| commit | 5f09724dbf7335f829e435ecf104071074e309e1 (patch) | |
| tree | e005648ecd6c7b52b325f8272a39ee03507dfc7a /src/xterm.c | |
| parent | 542dbe5c80102f83226baf87d9bae724ed8efcfb (diff) | |
| parent | ed96ace9289c2e04db3e8fc63321fde248c3f3f8 (diff) | |
| download | emacs-5f09724dbf7335f829e435ecf104071074e309e1.tar.gz emacs-5f09724dbf7335f829e435ecf104071074e309e1.zip | |
merge from upstream
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index a07279f987e..67cc250a1b2 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10150,8 +10150,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 10150 | dpyinfo->Xatom_net_wm_name | 10150 | dpyinfo->Xatom_net_wm_name |
| 10151 | = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); | 10151 | = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False); |
| 10152 | 10152 | ||
| 10153 | dpyinfo->cut_buffers_initialized = 0; | ||
| 10154 | |||
| 10155 | dpyinfo->x_dnd_atoms_size = 8; | 10153 | dpyinfo->x_dnd_atoms_size = 8; |
| 10156 | dpyinfo->x_dnd_atoms_length = 0; | 10154 | dpyinfo->x_dnd_atoms_length = 0; |
| 10157 | dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms) | 10155 | dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms) |