* eval.c (toplevel): Remove redundant #include directives.

* xterm.c (x_initialize): Add static to match prototype.

diff --git a/src/ChangeLog b/src/ChangeLog
index 142ede7d681a89654f8633ff93c2dc6a9a7b8ad8..82ab1e6254125528cfbda701b2035c3901e69aaa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
        * lisp.h (Fread_file_name): Do not EXFUN it.
        * composite.c (CHAR_COMPOSABLE_P): Replace unsafe macro with ...
        (char_composable_p): ... static function.  All users changed.
+       * eval.c (toplevel): Remove redundant #include directives.
+       * xterm.c (x_initialize): Add static to match prototype.
 
 2014-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/src/eval.c b/src/eval.c
index a96d413d09fc6494c9982d3046b05a29a8076a94..7d54ddb18f50532ea6d2b001cb3b5aa3e761bda5 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -27,11 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "commands.h"
 #include "keyboard.h"
 #include "dispextern.h"
-#include "frame.h"             /* For XFRAME.  */
-
-#if HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
 
 /* Chain of condition and catch handlers currently in effect.  */
 

diff --git a/src/xterm.c b/src/xterm.c
index a5f6ae7d0aba5d0e5a54e12e11c56869d9a73bda..530bfe63dcb8c739bf613b1c85aa14ed4a157c67 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10568,7 +10568,7 @@ x_create_terminal (struct x_display_info *dpyinfo)
   return terminal;
 }
 
-void
+static void
 x_initialize (void)
 {
   baud_rate = 19200;