From 4d0ac3d738c0055be74d955ef0ca9b31d2752a28 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 23 Oct 2007 21:17:06 +0000 Subject: [PATCH] * 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. --- src/ChangeLog | 6 ++++++ src/lisp.h | 6 ++++++ src/macterm.h | 2 -- src/msdos.h | 1 - src/xterm.h | 1 - 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3da07722a7a..0d8dfc6aa36 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2007-10-23 Stefan Monnier + * 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. diff --git a/src/lisp.h b/src/lisp.h index 47e40c63328..24b908df8e9 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3170,6 +3170,7 @@ EXFUN (Fnext_single_property_change, 4); 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 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 /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */ diff --git a/src/macterm.h b/src/macterm.h index f319adeb659..9fbbbc5a2f5 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -680,8 +680,6 @@ extern void x_clear_frame_selections P_ ((struct frame *)); /* 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 *)); diff --git a/src/msdos.h b/src/msdos.h index c45a5853a6c..a9379efb75d 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -115,7 +115,6 @@ struct window; /* 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 *)); diff --git a/src/xterm.h b/src/xterm.h index c8b768f6187..081a9c42343 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1051,7 +1051,6 @@ extern Lisp_Object x_property_data_to_lisp P_ ((struct frame *, /* 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)); -- 2.39.2