From 687897203846c5a8aca4ffa1a76834d20e1fcc3b Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Thu, 11 Aug 2022 17:10:52 +0200
Subject: [PATCH] Make ps-print-version variable obsolete
* lisp/ps-print.el (ps-print-version): Make obsolete.
(ps-setup, ps-begin-file):
* lisp/progmodes/ebnf2ps.el:
* lisp/printing.el:
(pr-help-message, pr-interface-help-message)
(pr-create-interface): Don't use above obsolete variable.
---
lisp/printing.el | 16 ++++------------
lisp/progmodes/ebnf2ps.el | 3 ---
lisp/ps-print.el | 29 ++++++++++++++---------------
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/lisp/printing.el b/lisp/printing.el
index 3e3baa301af..9f6b0910238 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1008,10 +1008,6 @@
(require 'lpr)
(require 'ps-print)
-(and (string< ps-print-version "6.6.4")
- (error "`printing' requires `ps-print' package version 6.6.4 or later"))
-
-
(defconst pr-cygwin-system
(and lpr-windows-system (getenv "OSTYPE")
(string-match "cygwin" (getenv "OSTYPE"))))
@@ -3000,8 +2996,7 @@ Calls `pr-update-menus' to adjust menus."
(defconst pr-help-message
- (concat "ps-print.el version " ps-print-version
- "\n\n
+ "\
Menu Layout
-----------
@@ -3207,13 +3202,12 @@ VI. Customization:
23. Show current settings for `printing', `ps-print' or `lpr'.
24. Quick help for printing menu layout.
-")
+"
"Printing help message.")
(defconst pr-interface-help-message
- (concat " ps-print.el version " ps-print-version
- "\n\n
+ "\
The printing interface buffer has the same functionality as the printing menu.
The major difference is that the states (like sending PostScript generated to a
file, n-up printing, etc.) are set and saved between printing buffer
@@ -3440,7 +3434,7 @@ The printing interface buffer has the following sections:
Quick help for printing interface buffer and printing menu layout. You can
also quit the printing interface buffer or kill all printing help buffer.
-")
+"
"Printing buffer interface help message.")
@@ -5587,8 +5581,6 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
(switch-to-buffer (get-buffer-create pr-buffer-name))
;; header
- (let ((versions (concat "ps-print v" ps-print-version)))
- (widget-insert (make-string (- 79 (length versions)) ?\ ) versions))
(pr-insert-italic "\nCurrent Directory : " 1)
(pr-insert-italic default-directory)
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index e19726a7eab..0347160a0cb 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1154,9 +1154,6 @@ Please send all bug fixes and enhancements to
(require 'ps-print)
(eval-when-compile (require 'cl-lib))
-(and (string< ps-print-version "5.2.3")
- (error "`ebnf2ps' requires `ps-print' package version 5.2.3 or later"))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; User Variables:
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index dad4c8ffbac..c7d94b129b2 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -8,21 +8,9 @@
;; Kenichi Handa <handa@gnu.org> (multi-byte characters)
;; Maintainer: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>
;; Keywords: wp, print, PostScript
-;; Version: 7.3.5
+;; Old-Version: 7.3.5
;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
-(eval-when-compile (require 'cl-lib))
-
-(defconst ps-print-version "7.3.5"
- "ps-print.el, v 7.3.5 <2009/12/23 vinicius>
-
-Vinicius's last change version -- this file may have been edited as part of
-Emacs without changes to the version number. When reporting bugs, please also
-report the version of Emacs, if any, that ps-print was distributed with.
-
-Please send all bug fixes and enhancements to
- bug-gnu-emacs@gnu.org and Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>.")
-
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
@@ -1451,6 +1439,7 @@ Please send all bug fixes and enhancements to
;;; Code:
(require 'lpr)
+(eval-when-compile (require 'cl-lib))
;; autoloads for secondary file
(require 'ps-print-loaddefs)
@@ -3596,7 +3585,6 @@ The table depends on the current ps-print setup."
(mapconcat
#'ps-print-quote
(list
- (concat "\n;;; (Emacs) ps-print version " ps-print-version "\n")
";; internal vars"
(ps-comment-string "emacs-version " emacs-version)
(ps-comment-string "lpr-windows-system" lpr-windows-system)
@@ -5347,7 +5335,7 @@ XSTART YSTART are the relative position for the first page in a sheet.")
ps-adobe-tag
"%%Title: " (buffer-name) ; Take job name from name of
; first buffer printed
- "\n%%Creator: ps-print v" ps-print-version
+ "\n%%Creator: GNU Emacs " emacs-version
"\n%%For: " (user-full-name) ;FIXME: may need encoding!
"\n%%CreationDate: " (format-time-string "%T %b %d %Y") ;FIXME: encoding!
"\n%%Orientation: "
@@ -6548,6 +6536,17 @@ If FACE is not a valid face name, use default face."
(unless noninteractive
(add-hook 'kill-emacs-query-functions #'ps-kill-emacs-check))
+(defconst ps-print-version "7.3.5"
+ "ps-print.el, v 7.3.5 <2009/12/23 vinicius>
+
+Vinicius's last change version -- this file may have been edited as part of
+Emacs without changes to the version number. When reporting bugs, please also
+report the version of Emacs, if any, that ps-print was distributed with.
+
+Please send all bug fixes and enhancements to
+ bug-gnu-emacs@gnu.org and Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>.")
+(make-obsolete-variable 'ps-print-version 'emacs-version "29.1")
+
(define-obsolete-function-alias 'ps-print-ensure-fontified #'font-lock-ensure "29.1")
(provide 'ps-print)
--
2.39.5