diff options
Diffstat (limited to 'lisp/printing.el')
| -rw-r--r-- | lisp/printing.el | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/lisp/printing.el b/lisp/printing.el index 0c564237da6..90ef02fe7b1 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre <viniciusjl.gnu@gmail.com> ;; Keywords: wp, print, PostScript ;; Version: 6.9.3 -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-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> @@ -64,7 +64,7 @@ Please send all bug fixes and enhancements to ;; interface to ps-print package and it also provides some extra stuff. ;; ;; To download the latest ps-print package see -;; `http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage'. +;; `https://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage'. ;; Please, see README file for ps-print installation instructions. ;; ;; `printing' was inspired by: @@ -944,8 +944,8 @@ Please send all bug fixes and enhancements to ;; ;; * For `printing' package: ;; -;; printing `http://www.emacswiki.org/cgi-bin/emacs/download/printing.el' -;; ps-print `http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage' +;; printing `https://www.emacswiki.org/cgi-bin/emacs/download/printing.el' +;; ps-print `https://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage' ;; ;; * For GNU or Unix system: ;; @@ -5284,22 +5284,18 @@ If menu binding was not done, calls `pr-menu-bind'." (defun pr-interactive-n-up (mess) - (or (stringp mess) (setq mess "*")) - (save-match-data - (let* ((fmt-prompt "%s[%s] N-up printing (default 1): ") - (prompt "") - (str (read-string (format fmt-prompt prompt mess) nil nil "1")) - int) - (while (if (string-match "^\\s *[0-9]+$" str) - (setq int (string-to-number str) - prompt (cond ((< int 1) "Integer below 1; ") - ((> int 100) "Integer above 100; ") - (t nil))) - (setq prompt "Invalid integer syntax; ")) - (ding) - (setq str - (read-string (format fmt-prompt prompt mess) str nil "1"))) - int))) + (unless (stringp mess) + (setq mess "*")) + (let (int) + (while (or (< (setq int (read-number (format "[%s] N-up printing:" mess) 1)) + 0) + (> int 100)) + (if (< int 0) + (message "Integer below 1") + (message "Integer above 100")) + (sit-for 1) + (ding)) + int)) (defun pr-interactive-dir (mess) @@ -5323,7 +5319,7 @@ If menu binding was not done, calls `pr-menu-bind'." (defun pr-interactive-regexp (mess) - (read-string (format "[%s] File regexp to print: " mess) nil nil "")) + (read-string (format "[%s] File regexp to print: " mess))) (defun pr-interactive-dir-args (mess) @@ -5622,8 +5618,6 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." ;; header (let ((versions (concat "printing v" pr-version " ps-print v" ps-print-version))) - ;; to keep compatibility with Emacs 20 & 21: - ;; DO NOT REPLACE `?\ ' BY `?\s' (widget-insert (make-string (- 79 (length versions)) ?\ ) versions)) (pr-insert-italic "\nCurrent Directory : " 1) (pr-insert-italic default-directory) |