* image.c (png_load): Ignore png-supplied background color.

[bpt/emacs.git] / src / sunfns.c

diff --git a/src/sunfns.c b/src/sunfns.c
index d1c7bcd..86e64cb 100644 (file)
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -1,5 +1,6 @@
 /* Functions for Sun Windows menus and selection buffer.
-   Copyright (C) 1987, 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is probably totally obsolete.  In any case, the FSF is
 unwilling to support it.  We agreed to include it in our distribution
@@ -15,7 +16,7 @@ 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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -25,8 +26,8 @@ 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com>
 Original ideas by David Kastan and Eric Negaard, SRI International
@@ -286,7 +287,7 @@ sel_read (sel, file)
   register int i, n;
   register char *cp;
 
-  Current_Selection = make_string ("", 0);
+  Current_Selection = empty_unibyte_string;
   if (sel->sel_items <= 0)
     return (0);
   cp = (char *) malloc(sel->sel_items);
@@ -299,7 +300,7 @@ sel_read (sel, file)
     error("fread botch in sel_read");
     return(-1);
   } else if (n < 0) {
-    error("Error reading selection.");
+    error("Error reading selection");
     return(-1);
   }
   /*
@@ -362,7 +363,7 @@ sun_item_create (Pair)
   Lisp_Object String;
   Lisp_Object Value;
 
-  if (!CONSP(Pair)) wrong_type_argument(Qlistp, Pair);
+  CHECK_LIST_CONS (Pair, Pair);
   String = Fcar(Pair);
   CHECK_STRING(String);
   Value = Fcdr(Pair);