diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-28 21:08:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-28 21:08:28 -0700 |
| commit | 5fbc2025853d54edb763a6d4c24c90173f027ae0 (patch) | |
| tree | c0f68bf23057a268532c22ee28ee1e518cb75066 /src | |
| parent | b1c83d95b3d6d80137a76911581e6531a3376982 (diff) | |
| download | emacs-5fbc2025853d54edb763a6d4c24c90173f027ae0.tar.gz | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/emacs.c | 9 | ||||
| -rw-r--r-- | src/xterm.h | 1 |
3 files changed, 11 insertions, 5 deletions
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 */ |