Switch to recommended form of GPLv3 permissions notice.

[bpt/emacs.git] / lisp / term / x-win.el

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index acbb316..0db0815 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
+;; 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
@@ -19,9 +19,7 @@
 ;; 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/>.
 
 ;;; Commentary:
 
@@ -2500,40 +2498,43 @@ The value nil is the same as this list:
     ("etc/images/index" . "gtk-index")
     ("etc/images/search" . "gtk-find")
     ("etc/images/exit" . "gtk-quit")
+    ("etc/images/cancel" . "gtk-cancel")
+    ("etc/images/info" . "gtk-info")
+    ("etc/images/bookmark_add" . "n:bookmark_add")
     ;; Used in Gnus and/or MH-E:
-    ("etc/images/attach.xpm" . "gtk-attach")
-    ("etc/images/connect.xpm" . "gtk-connect")
-    ("etc/images/contact.xpm" . "gtk-contact")
-    ("etc/images/delete.xpm" . "gtk-delete")
-    ("etc/images/describe.xpm" . "gtk-properties")
-    ("etc/images/disconnect.xpm" . "gtk-disconnect")
-    ;; ("etc/images/exit.xpm" . "gtk-exit")
-    ("etc/images/lock-broken.xpm" . "gtk-lock_broken")
-    ("etc/images/lock-ok.xpm" . "gtk-lock_ok")
-    ("etc/images/lock.xpm" . "gtk-lock")
-    ("etc/images/next-page.xpm" . "gtk-next-page")
-    ("etc/images/refresh.xpm" . "gtk-refresh")
-    ("etc/images/sort-ascending.xpm" . "gtk-sort-ascending")
-    ("etc/images/sort-column-ascending.xpm" . "gtk-sort-column-ascending")
-    ("etc/images/sort-criteria.xpm" . "gtk-sort-criteria")
-    ("etc/images/sort-descending.xpm" . "gtk-sort-descending")
-    ("etc/images/sort-row-ascending.xpm" . "gtk-sort-row-ascending")
-    ("images/gnus/toggle-subscription.xpm" . "gtk-task-recurring")
-    ("images/mail/compose.xpm" . "gtk-mail-compose")
-    ("images/mail/copy.xpm" . "gtk-mail-copy")
-    ("images/mail/forward.xpm" . "gtk-mail-forward")
-    ("images/mail/inbox.xpm" . "gtk-inbox")
-    ("images/mail/move.xpm" . "gtk-mail-move")
-    ("images/mail/not-spam.xpm" . "gtk-not-spam")
-    ("images/mail/outbox.xpm" . "gtk-outbox")
-    ("images/mail/reply-all.xpm" . "gtk-mail-reply-to-all")
-    ("images/mail/reply.xpm" . "gtk-mail-reply")
-    ("images/mail/save-draft.xpm" . "gtk-mail-handling")
-    ("images/mail/send.xpm" . "gtk-mail-send")
-    ("images/mail/spam.xpm" . "gtk-spam")
+    ("etc/images/attach" . "gtk-attach")
+    ("etc/images/connect" . "gtk-connect")
+    ("etc/images/contact" . "gtk-contact")
+    ("etc/images/delete" . "gtk-delete")
+    ("etc/images/describe" . "gtk-properties")
+    ("etc/images/disconnect" . "gtk-disconnect")
+    ;; ("etc/images/exit" . "gtk-exit")
+    ("etc/images/lock-broken" . "gtk-lock_broken")
+    ("etc/images/lock-ok" . "gtk-lock_ok")
+    ("etc/images/lock" . "gtk-lock")
+    ("etc/images/next-page" . "gtk-next-page")
+    ("etc/images/refresh" . "gtk-refresh")
+    ("etc/images/sort-ascending" . "gtk-sort-ascending")
+    ("etc/images/sort-column-ascending" . "gtk-sort-column-ascending")
+    ("etc/images/sort-criteria" . "gtk-sort-criteria")
+    ("etc/images/sort-descending" . "gtk-sort-descending")
+    ("etc/images/sort-row-ascending" . "gtk-sort-row-ascending")
+    ("images/gnus/toggle-subscription" . "gtk-task-recurring")
+    ("images/mail/compose" . "gtk-mail-compose")
+    ("images/mail/copy" . "gtk-mail-copy")
+    ("images/mail/forward" . "gtk-mail-forward")
+    ("images/mail/inbox" . "gtk-inbox")
+    ("images/mail/move" . "gtk-mail-move")
+    ("images/mail/not-spam" . "gtk-not-spam")
+    ("images/mail/outbox" . "gtk-outbox")
+    ("images/mail/reply-all" . "gtk-mail-reply-to-all")
+    ("images/mail/reply" . "gtk-mail-reply")
+    ("images/mail/save-draft" . "gtk-mail-handling")
+    ("images/mail/send" . "gtk-mail-send")
+    ("images/mail/spam" . "gtk-spam")
     ;; No themed versions available:
-    ;; mail/preview.xpm (combining stock_mail and stock_zoom)
-    ;; mail/save.xpm    (combining stock_mail, stock_save and stock_convert)
+    ;; mail/preview (combining stock_mail and stock_zoom)
+    ;; mail/save    (combining stock_mail, stock_save and stock_convert)
     )
   "How icons for tool bars are mapped to Gtk+ stock items.
 Emacs must be compiled with the Gtk+ toolkit for this to have any effect.