From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 29 May 2011 04:08:28 +0000 (-0700)
Subject: * emacs.c [HAVE_X_WINDOWS]: Include "xterm.h".
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~106
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fbc2025853d54edb763a6d4c24c90173f027ae0;p=emacs.git

* emacs.c [HAVE_X_WINDOWS]: Include "xterm.h".

(x_clipboard_manager_save_all): Move extern decl to ...
* xterm.h: ... here, so that it can be checked for consistency.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6c56b878b01..29d4e75eefd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* emacs.c [HAVE_X_WINDOWS]: Include "xterm.h".
+	(x_clipboard_manager_save_all): Move extern decl to ...
+	* xterm.h: ... here, so that it can be checked for consistency.
+
 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xselect.c (x_clipboard_manager_save_frame)
diff --git a/src/emacs.c b/src/emacs.c
index 090fddada5c..cf74963a816 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -65,6 +65,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "nsterm.h"
 #endif
 
+#ifdef HAVE_X_WINDOWS
+#include "xterm.h"
+#endif
+
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif
@@ -1959,11 +1963,6 @@ sort_args (int argc, char **argv)
   xfree (priority);
 }
 
-#ifdef HAVE_X_WINDOWS
-/* Defined in xselect.c.  */
-extern void x_clipboard_manager_save_all (void);
-#endif
-
 DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
        doc: /* Exit the Emacs job and kill it.
 If ARG is an integer, return ARG as the exit program code.
diff --git a/src/xterm.h b/src/xterm.h
index 2184794af4e..2938de9b339 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1025,6 +1025,7 @@ extern Lisp_Object x_property_data_to_lisp (struct frame *,
                                             int,
                                             unsigned long);
 extern void x_clipboard_manager_save_frame (Lisp_Object);
+extern void x_clipboard_manager_save_all (void);
 
 /* Defined in xfns.c */