Merge changes from emacs-23 branch

[gnu-emacs] / oldXMenu / FindSel.c

diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 3de48cc105eba93d315b35ae0b1b01d30da535e8..72ee142dc80a07ff10d30be8407e2ac31b626cd6 100644 (file)
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -1,7 +1,23 @@
+/* Copyright    Massachusetts Institute of Technology    1985  */
+
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindSel.c,v 1.2 2003/09/01 15:45:47 miles Exp $ */
-/* Copyright    Massachusetts Institute of Technology    1985  */
+/*
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
@@ -17,10 +33,7 @@
 #include "XMenuInt.h"
 
 int
-XMenuFindSelection(menu, p_num, label)
-    register XMenu *menu;
-    int p_num;
-    register char *label;
+XMenuFindSelection(register XMenu *menu, int p_num, register char *label)
 {
     register XMPane *p_ptr;
     register XMSelect *s_ptr;
@@ -71,5 +84,3 @@ XMenuFindSelection(menu, p_num, label)
     return (XM_FAILURE);
 }
 
-/* arch-tag: 564a4a95-9ab0-4580-b05f-6970c4b25dd4
-   (do not change this comment) */