diff src/lisp.h @ 83308:63b7247f4be6

Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-320 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-321 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-322 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-323 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-325 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-326 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-328 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-329 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-331 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-70 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-71 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-72 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-73 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-348
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 28 May 2005 21:04:38 +0000
parents ad07ff6e4555 a3b4d6c789db
children e58cb448e07c
line wrap: on
line diff
--- a/src/lisp.h	Fri May 20 17:44:36 2005 +0000
+++ b/src/lisp.h	Sat May 28 21:04:38 2005 +0000
@@ -3099,7 +3099,7 @@
 
 /* defined in xmenu.c */
 EXFUN (Fx_popup_menu, 2);
-EXFUN (Fx_popup_dialog, 2);
+EXFUN (Fx_popup_dialog, 3);
 extern void syms_of_xmenu P_ ((void));
 
 /* defined in termchar.h */