2 files changed, 3 insertions, 2 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index fea0676068b..16386caffba 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -148,7 +148,7 @@ directory name of the directory where the `.emacs' file was looked for.")
            (setq version-control 'never))))
 
   ;; Choose a good default value for split-window-keep-point.
-  (setq split-window-keep-point (> baud-rate 2400))
+  (setq split-window-keep-point (> (baud-rate) 2400))
 
   ;; Read window system's init file if using a window system.
   (if (and window-system (not noninteractive))
diff --git a/src/xfns.c b/src/xfns.c
index 1cecae8f2b2..4af2c899390 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1424,6 +1424,7 @@ x_get_arg (alist, param, screen_name, attribute, type)
      enum resource_types type;
 {
   register Lisp_Object tem;
+  int i;
 
   tem = Fassq (param, alist);
   if (EQ (tem, Qnil))
@@ -4417,9 +4418,9 @@ Values can be the symbols Always, WhenMapped, or NotUseful.");
   defsubr (&Sx_defined_color);
 #if 0
   defsubr (&Sx_track_pointer);
-#endif
   defsubr (&Sx_grab_pointer);
   defsubr (&Sx_ungrab_pointer);
+#endif
 #else
   defsubr (&Sx_get_default);
   defsubr (&Sx_store_cut_buffer);