* term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.

* menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c17d3d1dbcb43c61a9a2bdcba51b1d603cd965b..0ba73e595534f0d8adf6ac12c8f37dcbc90ae77b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.
+       * menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.
+
 2014-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * window.c (Frecenter): Signal an error if window-buffer is not

diff --git a/src/menu.h b/src/menu.h
index e2d7601378e9774be86ddada7e63f53585fa1650..5b15294754d2040dd2add7e4a926824d05eca9f6 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -29,7 +29,7 @@ extern Lisp_Object Qunsupported__w32_dialog;
 /* Bit fields used by terminal-specific menu_show_hook.  */
 
 enum {
-  MENU_KEYMAPS = 0x1, 
+  MENU_KEYMAPS = 0x1,
   MENU_FOR_CLICK = 0x2,
   MENU_KBD_NAVIGATION = 0x4
 };
@@ -64,12 +64,12 @@ extern Lisp_Object x_menu_show (struct frame *, int, int, int,
 #ifdef HAVE_NTGUI
 extern Lisp_Object w32_menu_show (struct frame *, int, int, int,
                                  Lisp_Object, const char **);
+extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
+                                 Lisp_Object, const char **);
 #endif
 #ifdef HAVE_NS
 extern Lisp_Object ns_menu_show (struct frame *, int, int, int,
                                 Lisp_Object, const char **);
 #endif
-extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
-                                 Lisp_Object, const char **);
 extern ptrdiff_t menu_item_width (const unsigned char *);
 #endif /* MENU_H */

diff --git a/src/term.c b/src/term.c
index aa0be9871c8628f5c3b7224b15a9b998d1af4884..f38deb8f4f14655ea56acd07e777de316475ba22 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -3582,6 +3582,9 @@ tty_menu_new_item_coords (struct frame *f, int which, int *x, int *y)
     }
 }
 
+#ifndef HAVE_NTGUI
+static
+#endif
 Lisp_Object
 tty_menu_show (struct frame *f, int x, int y, int menuflags,
               Lisp_Object title, const char **error_name)