# HG changeset patch
# User Pavel Jan���k <Pavel@Janik.cz>
# Date 1002523526 0
# Node ID a4def420441920ccf4891eee90e8f124c4d7eded
# Parent  7f6969b62d39bf44918af8ae971a490fdf13e010
*** empty log message ***

diff -r 7f6969b62d39 -r a4def4204419 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 08 06:37:59 2001 +0000
+++ b/src/ChangeLog	Mon Oct 08 06:45:26 2001 +0000
@@ -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 -r 7f6969b62d39 -r a4def4204419 src/doc.c
--- a/src/doc.c	Mon Oct 08 06:37:59 2001 +0000
+++ b/src/doc.c	Mon Oct 08 06:45:26 2001 +0000
@@ -396,7 +396,7 @@
 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 -r 7f6969b62d39 -r a4def4204419 src/editfns.c
--- a/src/editfns.c	Mon Oct 08 06:37:59 2001 +0000
+++ b/src/editfns.c	Mon Oct 08 06:45:26 2001 +0000
@@ -21,6 +21,7 @@
 
 
 #include <config.h>
+#include <ctype.h>
 #include <sys/types.h>
 
 #ifdef VMS
diff -r 7f6969b62d39 -r a4def4204419 src/lisp.h
--- a/src/lisp.h	Mon Oct 08 06:37:59 2001 +0000
+++ b/src/lisp.h	Mon Oct 08 06:45:26 2001 +0000
@@ -2773,6 +2773,7 @@
 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 -r 7f6969b62d39 -r a4def4204419 src/xfaces.c
--- a/src/xfaces.c	Mon Oct 08 06:37:59 2001 +0000
+++ b/src/xfaces.c	Mon Oct 08 06:45:26 2001 +0000
@@ -605,6 +605,8 @@
 
 #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 -r 7f6969b62d39 -r a4def4204419 src/xfns.c
--- a/src/xfns.c	Mon Oct 08 06:37:59 2001 +0000
+++ b/src/xfns.c	Mon Oct 08 06:45:26 2001 +0000
@@ -11149,7 +11149,7 @@
 
 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 @@
 	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 @@
   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;