diff src/device-msw.c @ 563:183866b06e0b

[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents a3adcf42bcec
children 6db80f4ab17c
line wrap: on
line diff
--- a/src/device-msw.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/device-msw.c	Thu May 24 07:51:33 2001 +0000
@@ -631,7 +631,7 @@
       if (!sync_printer_with_devmode (d, devmode, ldm->devmode, new_name))
 	{
 	  global_free_2_maybe (hDevNames, hDevMode);
-	  error ("Printer device initialization I/O error, device deleted.");
+	  signal_error (Qio_error, "Printer device initialization I/O error, device deleted", Qunbound);
 	}
     }
   else
@@ -759,17 +759,16 @@
 	    else if (EQ (value, Qpages))
 	      flags |= PD_PAGENUMS;
 	    else if (!EQ (value, Qall))
-	      invalid_argument ("Invalid value for :selected-page-button",
-				value);
+	      invalid_constant ("for :selected-page-button", value);
 	  }
 	else
-	  syntax_error ("Unrecognized print-dialog keyword", key);
+	  invalid_constant ("Unrecognized print-dialog keyword", key);
       }
   }
 
   if ((UNBOUNDP (device) && UNBOUNDP (settings)) ||
       (!UNBOUNDP (device) && !UNBOUNDP (settings)))
-    syntax_error ("Exactly one of :device and :printer-settings must be given",
+    sferror ("Exactly one of :device and :printer-settings must be given",
 		  keys);
 
   return print_dialog_worker (!UNBOUNDP (device) ? device : settings, flags);
@@ -829,13 +828,13 @@
 	    plist = value;
 	  }
 	else
-	  syntax_error ("Unrecognized page-setup dialog keyword", key);
+	  invalid_constant ("Unrecognized page-setup dialog keyword", key);
       }
   }
 
   if ((UNBOUNDP (device) && UNBOUNDP (settings)) ||
       (!UNBOUNDP (device) && !UNBOUNDP (settings)))
-    syntax_error ("Exactly one of :device and :printer-settings must be given",
+    sferror ("Exactly one of :device and :printer-settings must be given",
 		  keys);
 
   if (UNBOUNDP (device))
@@ -937,8 +936,9 @@
 	DocumentProperties (NULL, DEVICE_MSPRINTER_HPRINTER(d),
 			    DEVICE_MSPRINTER_NAME(d), NULL, NULL, 0);
       if (dm_size <= 0)
-	invalid_operation ("Unable to specialize settings, printer error",
-			   device);
+	signal_error (Qio_error,
+		      "Unable to specialize settings, printer error",
+		      device);
 
       assert (XDEVMODE_SIZE (ldm) <= dm_size);
       ldm->devmode = xrealloc (ldm->devmode, dm_size);
@@ -949,7 +949,9 @@
      hold a larger one - not a big deal */
   if (!sync_printer_with_devmode (d, ldm->devmode, ldm->devmode,
 				  ldm->printer_name))
-    error ("Printer device initialization I/O error, device deleted.");
+    signal_error (Qio_error,
+		  "Printer device initialization I/O error, device deleted",
+		  Qunbound);
 
   if (ldm->printer_name == NULL)
     ldm->printer_name = xstrdup (DEVICE_MSPRINTER_NAME(d));
@@ -1006,7 +1008,9 @@
   if (!sync_printer_with_devmode (d, ldm_new->devmode,
 				  ldm_current->devmode,
 				  ldm_new->printer_name))
-    error ("Printer device initialization I/O error, device deleted.");
+    signal_error (Qio_error,
+		  "Printer device initialization I/O error, device deleted",
+		  Qunbound);
 
   if (ldm_new->printer_name != NULL)
     {
@@ -1029,8 +1033,8 @@
   char buf[100];
   Lisp_Devmode *dm = XDEVMODE (obj);
   if (print_readably)
-    error ("printing unreadable object #<msprinter-settings 0x%x>",
-           dm->header.uid);
+    printing_unreadable_object ("#<msprinter-settings 0x%x>",
+				dm->header.uid);
   write_c_string ("#<msprinter-settings", printcharfun);
   if (dm->printer_name)
     {