HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
[bpt/emacs.git]
/
src
/
xgselect.c
diff --git
a/src/xgselect.c
b/src/xgselect.c
index
5f4c7ed
..
db7dce1
100644
(file)
--- a/
src/xgselect.c
+++ b/
src/xgselect.c
@@
-1,6
+1,6
@@
/* Function for handling the GLib event loop.
/* Function for handling the GLib event loop.
-Copyright (C) 2009-201
2
Free Software Foundation, Inc.
+Copyright (C) 2009-201
3
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-19,14
+19,12
@@
along with GNU Emacs. If not, see <http§://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
-#include <setjmp.h>
#include "xgselect.h"
#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
#include <glib.h>
#include <errno.h>
#include "xgselect.h"
#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
#include <glib.h>
#include <errno.h>
-#include <setjmp.h>
#include "xterm.h"
int
#include "xterm.h"
int