diff options
| author | Kenichi Handa | 2006-03-30 00:47:04 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-03-30 00:47:04 +0000 |
| commit | 3c5f949213fb8473297adbf474379f65d91d0c4d (patch) | |
| tree | 2dc1e2b3ef7224531659f7ff9f5caa4efd64832a /src | |
| parent | 50ec4c58f827c278d7b5ffb4d10ea4074e4acb77 (diff) | |
| download | emacs-3c5f949213fb8473297adbf474379f65d91d0c4d.tar.gz emacs-3c5f949213fb8473297adbf474379f65d91d0c4d.zip | |
(x_term_init): Delete superfluous UNGCPRO.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d2ed5ea7e7d..f2756b3d02b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-03-30 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * xterm.c (x_term_init): Delete superfluous UNGCPRO. | ||
| 4 | |||
| 1 | 2006-03-29 Juanma Barranquero <lekktu@gmail.com> | 5 | 2006-03-29 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * keyboard.c (process_tool_bar_item): Reorder dummy args. | 7 | * keyboard.c (process_tool_bar_item): Reorder dummy args. |
diff --git a/src/xterm.c b/src/xterm.c index 0ca086b58db..ba51dbb8f55 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10213,8 +10213,6 @@ x_term_init (display_name, xrm_option, resource_name) | |||
| 10213 | 10213 | ||
| 10214 | if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file))) | 10214 | if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file))) |
| 10215 | gtk_rc_parse (SDATA (abs_file)); | 10215 | gtk_rc_parse (SDATA (abs_file)); |
| 10216 | |||
| 10217 | UNGCPRO; | ||
| 10218 | } | 10216 | } |
| 10219 | 10217 | ||
| 10220 | XSetErrorHandler (x_error_handler); | 10218 | XSetErrorHandler (x_error_handler); |