* server.el (server-buffer-done): Avoid changing the buffer when

[gnu-emacs] / lisp / ps-def.el

diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index 72a8bbf3e2310cf0d34c8f0581404103b7c29099..fb23063aae2dffcff4d404a62b5aca41241b5444 100644 (file)
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -11,19 +11,18 @@
 
 ;; 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, or (at your option) any later
-;; version.
+;; 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.
+;; 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; see the file COPYING.  If not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -178,17 +177,8 @@
 
   ;; Return t if the device (which can be changed during an emacs session)
   ;; can handle colors.
-  ;; XEmacs change: Need to check for emacs-major-version too.
-  (if (or (> emacs-major-version 19)
-         (and (= emacs-major-version 19)
-              (>= emacs-minor-version 12)))
-      ;; xemacs >= 19.12
-      (defun ps-color-device ()
-       (eq (device-class) 'color))
-    ;; xemacs < 19.12
-    (setq ps-print-color-p nil)
-    (defalias 'ps-color-device 'ignore))
-
+  (defun ps-color-device ()
+    (eq (device-class) 'color))
 
   (defun ps-mapper (extent list)
     (nconc list