[Emacs-diffs] trunk r117285: * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.

[Paul Eggert]

------------------------------------------------------------
revno: 117285
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2014-06-06 12:33:19 -0700
message:
  * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.
  
  * menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/menu.h                     menu.h-20091113204419-o5vbwnq5f7feedwu-8702
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-06 14:37:05 +0000
+++ b/src/ChangeLog     2014-06-06 19:33:19 +0000
@@ -1,3 +1,8 @@
+2014-06-06  Paul Eggert  <address@hidden>
+
+       * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.
+       * menu.h (tty_menu_show) [!HAVE_NTGUI]: Omit extern decl.
+
 2014-06-06  Stefan Monnier  <address@hidden>
 
        * window.c (Frecenter): Signal an error if window-buffer is not

=== modified file 'src/menu.h'
--- a/src/menu.h        2014-06-04 04:58:31 +0000
+++ b/src/menu.h        2014-06-06 19:33:19 +0000
@@ -29,7 +29,7 @@
 /* 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 @@
 #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 */

=== modified file 'src/term.c'
--- a/src/term.c        2014-06-04 04:58:31 +0000
+++ b/src/term.c        2014-06-06 19:33:19 +0000
@@ -3582,6 +3582,9 @@
     }
 }
 
+#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)