Commit 5fbc2025 authored by Paul Eggert's avatar Paul Eggert

* 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.
parent b1c83d95
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> 2011-05-29 Chong Yidong <cyd@stupidchicken.com>
* xselect.c (x_clipboard_manager_save_frame) * xselect.c (x_clipboard_manager_save_frame)
......
...@@ -65,6 +65,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -65,6 +65,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "nsterm.h" #include "nsterm.h"
#endif #endif
#ifdef HAVE_X_WINDOWS
#include "xterm.h"
#endif
#ifdef HAVE_SETLOCALE #ifdef HAVE_SETLOCALE
#include <locale.h> #include <locale.h>
#endif #endif
...@@ -1959,11 +1963,6 @@ sort_args (int argc, char **argv) ...@@ -1959,11 +1963,6 @@ sort_args (int argc, char **argv)
xfree (priority); 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", DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
doc: /* Exit the Emacs job and kill it. doc: /* Exit the Emacs job and kill it.
If ARG is an integer, return ARG as the exit program code. If ARG is an integer, return ARG as the exit program code.
......
...@@ -1025,6 +1025,7 @@ extern Lisp_Object x_property_data_to_lisp (struct frame *, ...@@ -1025,6 +1025,7 @@ extern Lisp_Object x_property_data_to_lisp (struct frame *,
int, int,
unsigned long); unsigned long);
extern void x_clipboard_manager_save_frame (Lisp_Object); extern void x_clipboard_manager_save_frame (Lisp_Object);
extern void x_clipboard_manager_save_all (void);
/* Defined in xfns.c */ /* Defined in xfns.c */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment