*** empty log message ***

6 files changed, 9 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 493a7f61d42..3c5cf4e4721 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+        * xfaces.c (free_frame_menubar): Add prototype.
+
         * lisp.h (init_window): Add prototype.
 
         * editfns.c: Include ctype.h.
diff --git a/src/doc.c b/src/doc.c
index 8f888316f7a..f98303a30de 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -396,7 +396,7 @@ DEFUN ("documentation-property", Fdocumentation_property,
 Third argument RAW omitted or nil means pass the result through\n\
 `substitute-command-keys' if it is a string.\n\
 \n\
-This is differs from `get' in that it can refer to strings stored in the\n\
+This differs from `get' in that it can refer to strings stored in the\n\
 `etc/DOC' file; and that it evaluates documentation properties that\n\
 aren't strings.")
   (symbol, prop, raw)
diff --git a/src/editfns.c b/src/editfns.c
index 2cf10923b37..fba78c3a1be 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
+#include <ctype.h>
 #include <sys/types.h>
 
 #ifdef VMS
diff --git a/src/lisp.h b/src/lisp.h
index 6d46be83ea3..b483e72cef7 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2773,6 +2773,7 @@ EXFUN (Fset_window_start, 3);
 extern void temp_output_buffer_show P_ ((Lisp_Object));
 extern void replace_buffer_in_all_windows P_ ((Lisp_Object));
 extern void init_window_once P_ ((void));
+extern void init_window P_ ((void));
 extern void syms_of_window P_ ((void));
 extern void keys_of_window P_ ((void));
 
diff --git a/src/xfaces.c b/src/xfaces.c
index e39dfe214f7..94541654238 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -605,6 +605,8 @@ extern Lisp_Object w32_list_fonts P_ ((struct frame *, Lisp_Object, int, int));
 
 #ifdef USE_X_TOOLKIT
 static void x_update_menu_appearance P_ ((struct frame *));
+
+extern void free_frame_menubar P_ ((struct frame *));
 #endif /* USE_X_TOOLKIT */
 
 #endif /* HAVE_WINDOW_SYSTEM */
diff --git a/src/xfns.c b/src/xfns.c
index 338a8781d28..3f61e643159 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -11149,7 +11149,7 @@ Text larger than the specified size is clipped.")
 
 DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0,
   "Hide the current tooltip window, if there is any.\n\
-Value is t is tooltip was open, nil otherwise.")
+Value is t if tooltip was open, nil otherwise.")
   ()
 {
   int count;
@@ -11185,7 +11185,7 @@ Value is t is tooltip was open, nil otherwise.")
         struct frame *f = SELECTED_FRAME ();
         Widget w = f->output_data.x->menubar_widget;
         extern void xlwmenu_redisplay P_ ((Widget));
-        
+
         if (!DoesSaveUnders (FRAME_X_DISPLAY_INFO (f)->screen)
             && w != NULL)
           {
@@ -11253,9 +11253,7 @@ selection dialog's entry field, if MUSTMATCH is non-nil.")
   Arg al[10];
   int ac = 0;
   extern XtAppContext Xt_app_con;
-  char *title;
   XmString dir_xmstring, pattern_xmstring;
-  int popup_activated_flag;
   int count = specpdl_ptr - specpdl;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;