From: Stefan Kangas <stefankangas@gmail.com>
Date: Tue, 27 Sep 2022 21:51:21 +0000 (+0200)
Subject: Standardize XPM files
X-Git-Tag: emacs-29.0.90~1856^2~176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5b59d1b8afe1e13f63190b9688ddfd9605f2945;p=emacs.git

Standardize XPM files

These headers make GraphicsMagick croak with "Improper image header".
Note that the copyright information is already in README.

* etc/images/checked.xpm:
* etc/images/gnus/gnus.xpm:
* etc/images/gnus/gnus-pointer.xpm:
* etc/images/mh-logo.xpm:
* etc/images/unchecked.xpm: Normalize file headers.
---

diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm
index aefa9dd5da0..4dbcb9e6fdd 100644
--- a/etc/images/checked.xpm
+++ b/etc/images/checked.xpm
@@ -1,23 +1,4 @@
 /* XPM */
-/* Copyright (C) 2010-2022 Free Software Foundation, Inc.
- *
- * Author: Chong Yidong <cyd@stupidchicken.com>
- *
- * This file is part of GNU Emacs.
- *
- * GNU Emacs 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.
- *
- * GNU Emacs 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 GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
- */
 static char * checked_xpm[] = {
 "12 12 5 1",
 " 	c None",
diff --git a/etc/images/gnus/gnus-pointer.xpm b/etc/images/gnus/gnus-pointer.xpm
index c47443dbb74..5328b15bedd 100644
--- a/etc/images/gnus/gnus-pointer.xpm
+++ b/etc/images/gnus/gnus-pointer.xpm
@@ -1,7 +1,7 @@
 /* XPM */
-static char *gnus-pointer[] = {
+static char *gnus_pointer_xpm[] = {
 /* width height num_colors chars_per_pixel */
-"    18    13        2            1",
+"18 13 2 1",
 /* colors */
 ". c #0000ff",
 "# c None s None",
@@ -19,4 +19,4 @@ static char *gnus-pointer[] = {
 "###....####.######",
 "###..######.######",
 "###########.######"
-};
\ No newline at end of file
+};
diff --git a/etc/images/gnus/gnus.xpm b/etc/images/gnus/gnus.xpm
index b6ee4d0d733..4f46eca4fa3 100644
--- a/etc/images/gnus/gnus.xpm
+++ b/etc/images/gnus/gnus.xpm
@@ -1,7 +1,7 @@
 /* XPM */
-static char *gnus[] = {
+static char *gnus_xpm[] = {
 /* width height num_colors chars_per_pixel */
-"   271   273        3            1",
+"271 273 3 1",
 /* colors */
 ". s thing c #bf9900",
 "# s shadow c #ffcc00",
diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm
index 846859e0584..637c4569642 100644
--- a/etc/images/mh-logo.xpm
+++ b/etc/images/mh-logo.xpm
@@ -1,32 +1,8 @@
 /* XPM */
-/* MH-E Logo
- *
- * Copyright (C) 2003-2022 Free Software Foundation, Inc.
- *
- * Author: Satyaki Das
- *
- * This file is part of GNU Emacs.
- *
- * GNU Emacs 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.
- *
- * GNU Emacs 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 GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
- */
-static char *mh-e[] = {
-/* width height num_colors chars_per_pixel */
-"    18    13        2            1",
-/* colors */
+static char *mh_logo_xpm[] = {
+"18 13 2 1",
 "# c #666699",
 ". c None s None",
-/* pixels */
 "........##........",
 ".......####.......",
 "......######......",
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm
index b758346b96f..85eec75230e 100644
--- a/etc/images/unchecked.xpm
+++ b/etc/images/unchecked.xpm
@@ -1,23 +1,4 @@
 /* XPM */
-/* Copyright (C) 2010-2022 Free Software Foundation, Inc.
- *
- * Author: Chong Yidong <cyd@stupidchicken.com>
- *
- * This file is part of GNU Emacs.
- *
- * GNU Emacs 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.
- *
- * GNU Emacs 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 GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
- */
 static char * unchecked_xpm[] = {
 "12 12 5 1",
 " 	c None",