--- a/lisp/device.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/lisp/device.el	Mon Aug 13 11:20:41 2007 +0200
@@ -31,18 +31,6 @@
 
 ;;; Code:
 
-;;; Initialization
-
-; Specifier tag 'printer which matches printers
-(define-specifier-tag 'printer (function device-printer-p))
-
-; Specifier tag 'display which matches displays
-(define-specifier-tag 'display (function
-				(lambda (device)
-				  (not (device-printer-p device)))))
-
-;;; Functions
-
 (defun device-list ()
   "Return a list of all devices."
   (apply 'nconc (mapcar 'console-device-list (console-list))))
@@ -53,8 +41,8 @@
 Value is `tty' for a tty device (a character-only terminal),
 `x' for a device that is a screen on an X display,
 `ns' for a device that is a NeXTstep connection (not yet implemented),
-`mswindows' for a device that is a MS Windows workstation,
-`msprinter' for a device that is a MS Windows printer connection,
+`mswindows' for a device that is a Windows or Windows NT connection,
+`pc' for a device that is a direct-write MS-DOS screen (not yet implemented),
 `stream' for a stream device (which acts like a stdio stream), and
 `dead' for a deleted device."
   (or device (setq device (selected-device)))
@@ -120,7 +108,7 @@
 
 (defun call-device-method (name device &rest args)
   "Call a DEVICE-specific function with the generic name NAME.
-If DEVICE is not provided then the selected device is used."
+If DEVICE is not provide the selected device is used."
   (or device (setq device (selected-device)))
   (or (symbolp name) (error "function name must be a symbol"))
   (let ((devmeth (intern (concat (symbol-name