Mercurial > emacs
changeset 85595:4f5a9f3d91ae
* lisp.h (Fget_text_property): Declare.
(have_menus_p): Declare it here rather than in sys-dep header files.
* macterm.h (have_menus_p):
* msdos.h (have_menus_p):
* xterm.h (have_menus_p): Remove.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 23 Oct 2007 21:17:06 +0000 |
| parents | 237166b2d28f |
| children | ca34d3d5d8bf |
| files | src/ChangeLog src/lisp.h src/macterm.h src/msdos.h src/xterm.h |
| diffstat | 5 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Oct 23 20:56:27 2007 +0000 +++ b/src/ChangeLog Tue Oct 23 21:17:06 2007 +0000 @@ -1,5 +1,11 @@ 2007-10-23 Stefan Monnier <monnier@iro.umontreal.ca> + * lisp.h (Fget_text_property): Declare. + (have_menus_p): Declare it here rather than in sys-dep header files. + * macterm.h (have_menus_p): + * msdos.h (have_menus_p): + * xterm.h (have_menus_p): Remove. + * data.c (Fmake_variable_buffer_local, Fmake_local_variable) (Fmake_variable_frame_local): Just check the variable's const-ness rather than checking nil or t.
--- a/src/lisp.h Tue Oct 23 20:56:27 2007 +0000 +++ b/src/lisp.h Tue Oct 23 21:17:06 2007 +0000 @@ -3170,6 +3170,7 @@ EXFUN (Fnext_single_char_property_change, 4); EXFUN (Fprevious_single_property_change, 4); 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)); @@ -3303,6 +3304,11 @@ 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 /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */
--- a/src/macterm.h Tue Oct 23 20:56:27 2007 +0000 +++ b/src/macterm.h Tue Oct 23 21:17:06 2007 +0000 @@ -680,8 +680,6 @@ /* Defined in macfns.c */ -extern int have_menus_p P_ ((void)); - extern void x_real_positions P_ ((struct frame *, int *, int *)); extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); extern int x_pixel_width P_ ((struct frame *));
--- a/src/msdos.h Tue Oct 23 20:56:27 2007 +0000 +++ b/src/msdos.h Tue Oct 23 21:17:06 2007 +0000 @@ -115,7 +115,6 @@ /* Defined in xfns.c; emulated on msdos.c */ -extern int have_menus_p P_ ((void)); extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); extern int x_pixel_width P_ ((struct frame *)); extern int x_pixel_height P_ ((struct frame *));
--- a/src/xterm.h Tue Oct 23 20:56:27 2007 +0000 +++ b/src/xterm.h Tue Oct 23 21:17:06 2007 +0000 @@ -1051,7 +1051,6 @@ /* Defined in xfns.c */ extern struct x_display_info * check_x_display_info P_ ((Lisp_Object frame)); -extern int have_menus_p P_ ((void)); #ifdef USE_GTK extern int xg_set_icon P_ ((struct frame *, Lisp_Object));