Fix shr.el/image build problem

[gnu-emacs] / lwlib / xlwmenu.h

diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 3279d10f760d3c44d466ccbedcfbd4e0e3e0d4b1..43c17f19be0ce72d86e07e44ddd43ddec0a18896 100644 (file)
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,7 +1,7 @@
 /* Interface of a lightweight menubar widget.
+
+Copyright (C) 2002-2016 Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
@@ -16,9 +16,7 @@ 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 GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _XlwMenu_h
 #define _XlwMenu_h
@@ -58,10 +56,6 @@ Boston, MA 02110-1301, USA.  */
 #define XtCResizeToPreferred "ResizeToPreferred"
 #define XtNallowResize "allowResize"
 #define XtCAllowResize "AllowResize"
-#define XtNfaceName "faceName"
-#define XtCFaceName "FaceName"
-#define XtNdefaultFace "defaultFace"
-#define XtCDefaultFace "DefaultFace"
 
 /* Motif-compatible resource names */
 #define XmNshadowThickness     "shadowThickness"
@@ -85,6 +79,3 @@ extern int xlwmenu_window_p (Widget w, Window window);
 extern void xlwmenu_redisplay (Widget);
 
 #endif /* _XlwMenu_h */
-
-/* arch-tag: 0c019735-d61b-4080-be85-4fdd6e50ae07
-   (do not change this comment) */