diff options
Diffstat (limited to 'lisp/printing.el')
| -rw-r--r-- | lisp/printing.el | 57 |
1 files changed, 22 insertions, 35 deletions
diff --git a/lisp/printing.el b/lisp/printing.el index b5f31522681..534b45c772b 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -4,16 +4,9 @@ ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, print, PostScript -;; Version: 6.9.3 +;; Old-Version: 6.9.3 ;; URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre -(defconst pr-version "6.9.3" - "printing.el, v 6.9.3 <2007/12/09 vinicius> - -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 @@ -1006,10 +999,6 @@ Please send all bug fixes and enhancements to (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")))) @@ -2773,7 +2762,7 @@ See `pr-ps-printer-alist'.") ["4-up" (pr-ps-buffer-preview 4 t) t] ["Other..." (pr-ps-buffer-preview nil t) :keys "\\[pr-ps-buffer-preview]"]) - ("Region" :active (and (not pr-spool-p) (ps-mark-active-p)) + ("Region" :active (and (not pr-spool-p) mark-active) ["1-up" (pr-ps-region-preview 1 t) t] ["2-up" (pr-ps-region-preview 2 t) t] ["4-up" (pr-ps-region-preview 4 t) t] @@ -2828,7 +2817,7 @@ See `pr-ps-printer-alist'.") ["4-up" (pr-ps-buffer-ps-print 4 t) t] ["Other..." (pr-ps-buffer-ps-print nil t) :keys "\\[pr-ps-buffer-ps-print]"]) - ("Region" :active (ps-mark-active-p) + ("Region" :active mark-active ["1-up" (pr-ps-region-ps-print 1 t) t] ["2-up" (pr-ps-region-ps-print 2 t) t] ["4-up" (pr-ps-region-ps-print 4 t) t] @@ -2878,12 +2867,12 @@ See `pr-ps-printer-alist'.") "Replace non-printing chars with printable representations." ["Directory" pr-printify-directory t] ["Buffer" pr-printify-buffer t] - ["Region" pr-printify-region (ps-mark-active-p)]) + ["Region" pr-printify-region mark-active]) ("Print" :included (pr-visible-p 'text) :help "Send text to printer" ["Directory" pr-txt-directory t] ["Buffer" pr-txt-buffer t] - ["Region" pr-txt-region (ps-mark-active-p)] + ["Region" pr-txt-region mark-active] ["Mode" pr-txt-mode (pr-mode-alist-p)]) ["Text Printers" pr-update-menus :active pr-txt-printer-alist :included (pr-visible-p 'text) @@ -2998,9 +2987,7 @@ Calls `pr-update-menus' to adjust menus." (defconst pr-help-message - (concat "printing.el version " pr-version - " ps-print.el version " ps-print-version - "\n\n + "\ Menu Layout ----------- @@ -3206,14 +3193,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 "printing.el version " pr-version - " 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 +3425,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.") @@ -4393,7 +4378,6 @@ Or choose the menu option Printing/Show Settings/printing." (mapconcat #'ps-print-quote (list - (concat "\n;;; printing.el version " pr-version "\n") ";; internal vars" (ps-comment-string "emacs-version " emacs-version) (ps-comment-string "pr-txt-command " pr-txt-command) @@ -5576,7 +5560,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." (defun pr-create-interface () "Create the front end for printing package." (setq pr-i-buffer (buffer-name (current-buffer)) - pr-i-region (ps-mark-active-p) + pr-i-region mark-active pr-i-mode (pr-mode-alist-p) pr-i-window-configuration (current-window-configuration)) @@ -5588,9 +5572,6 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." (switch-to-buffer (get-buffer-create pr-buffer-name)) ;; header - (let ((versions (concat "printing v" pr-version - " 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) @@ -5642,11 +5623,11 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." (nreverse choices)) " Buffer : " nil (lambda () - (pr-interface-save - (setq pr-i-region (ps-mark-active-p) - pr-i-mode (pr-mode-alist-p))) - (pr-update-checkbox 'pr-i-region) - (pr-update-checkbox 'pr-i-mode))) + (pr-interface-save + (setq pr-i-region mark-active + pr-i-mode (pr-mode-alist-p))) + (pr-update-checkbox 'pr-i-region) + (pr-update-checkbox 'pr-i-mode))) ;; 1a. Buffer: Region (put 'pr-i-region 'pr-widget (pr-insert-checkbox @@ -5654,7 +5635,7 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." 'pr-i-region (lambda (widget &rest _ignore) (let ((region-p (pr-interface-save - (ps-mark-active-p)))) + mark-active))) (cond ((null (widget-value widget)) ; widget is nil (setq pr-i-region nil)) (region-p ; widget is true and there is a region @@ -6204,6 +6185,12 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defconst pr-version "6.9.3" + "printing.el, v 6.9.3 <2007/12/09 vinicius> + +Please send all bug fixes and enhancements to + bug-gnu-emacs@gnu.org and Vinicius Jose Latorre <viniciusjl.gnu@gmail.com>") +(make-obsolete-variable 'pr-version 'emacs-version "29.1") (provide 'printing) |