Merge from emacs--devo--0

[gnu-emacs] / src / lisp.h

diff --git a/src/lisp.h b/src/lisp.h
index 8a0b13a72a190c18109f1a52aa53ae2880305d42..62c629bd4a8c0106e1f3b89279c8db91f0a6f87b 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3159,6 +3159,7 @@ EXFUN (Fnext_single_char_property_change, 4);
 EXFUN (Fprevious_single_property_change, 4);
 EXFUN (Fget_text_property, 3);
 EXFUN (Fput_text_property, 5);
+EXFUN (Fget_text_property, 3);
 EXFUN (Fprevious_char_property_change, 2);
 EXFUN (Fnext_char_property_change, 2);
 extern void report_interval_modification P_ ((Lisp_Object, Lisp_Object));
@@ -3294,6 +3295,11 @@ extern void syms_of_mac P_ ((void));
 extern void init_mac_osx_environment P_ ((void));
 #endif /* MAC_OSX */
 #endif /* MAC_OS */
+
+#ifdef HAVE_MENUS
+/* Defined in (x|mac|w32)fns.c...  */
+extern int have_menus_p P_ ((void));
+#endif
 \f
 /* Nonzero means Emacs has already been initialized.
    Used during startup to detect startup of dumped Emacs.  */