[Emacs-diffs] Changes to emacs/lisp/printing.el [lexbind]

[Miles Bader]

Index: emacs/lisp/printing.el
diff -c emacs/lisp/printing.el:1.3.2.13 emacs/lisp/printing.el:1.3.2.14
*** emacs/lisp/printing.el:1.3.2.13     Wed Oct  6 05:23:53 2004
--- emacs/lisp/printing.el      Fri Nov 12 04:21:11 2004
***************
*** 5,17 ****
  
  ;; Author: Vinicius Jose Latorre <address@hidden>
  ;; Maintainer: Vinicius Jose Latorre <address@hidden>
! ;; Time-stamp: <2004/09/26 22:11:24 vinicius>
  ;; Keywords: wp, print, PostScript
! ;; Version: 6.8.1
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst pr-version "6.8.1"
!   "printing.el, v 6.8.1 <2004/09/26 vinicius>
  
  Please send all bug fixes and enhancements to
        Vinicius Jose Latorre <address@hidden>
--- 5,17 ----
  
  ;; Author: Vinicius Jose Latorre <address@hidden>
  ;; Maintainer: Vinicius Jose Latorre <address@hidden>
! ;; Time-stamp: <2004/11/11 23:54:13 vinicius>
  ;; Keywords: wp, print, PostScript
! ;; Version: 6.8.2
  ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
  
! (defconst pr-version "6.8.2"
!   "printing.el, v 6.8.2 <2004/11/11 vinicius>
  
  Please send all bug fixes and enhancements to
        Vinicius Jose Latorre <address@hidden>
***************
*** 1099,1104 ****
--- 1099,1105 ----
    :tag "Printing Utilities"
    :link '(emacs-library-link :tag "Source Lisp File" "printing.el")
    :prefix "pr-"
+   :version "20"
    :group 'wp
    :group 'postscript)
  
***************
*** 2474,2493 ****
  
  (eval-and-compile
    (defun pr-get-symbol (name)
!     ;; Recent versions of easy-menu downcase names before interning them.
!     (and (fboundp 'easy-menu-name-match)
!        (setq name (downcase name)))
!     (or (intern-soft name)
!       (make-symbol name)))
  
    (cond
     ((eq ps-print-emacs-type 'emacs)   ; GNU Emacs
!     (defsubst pr-region-active-p ()
        (and pr-auto-region transient-mark-mode mark-active)))
  
     ((eq ps-print-emacs-type 'xemacs)  ; XEmacs
      (defvar zmacs-region-stays nil)   ; to avoid compilation gripes
!     (defsubst pr-region-active-p ()
        (and pr-auto-region (not zmacs-region-stays) (ps-mark-active-p)))))
  
  
--- 2475,2490 ----
  
  (eval-and-compile
    (defun pr-get-symbol (name)
!     (easy-menu-intern name))
  
    (cond
     ((eq ps-print-emacs-type 'emacs)   ; GNU Emacs
!     (defun pr-region-active-p ()
        (and pr-auto-region transient-mark-mode mark-active)))
  
     ((eq ps-print-emacs-type 'xemacs)  ; XEmacs
      (defvar zmacs-region-stays nil)   ; to avoid compilation gripes
!     (defun pr-region-active-p ()
        (and pr-auto-region (not zmacs-region-stays) (ps-mark-active-p)))))
  
  
***************
*** 2907,2924 ****
                                  (pr-get-symbol "Printing")))))
       ;; Emacs 21
       (pr-menu-print-item
!       (easy-menu-change '("files") "Print" pr-menu-spec "print-buffer")
        (let ((items '("print-buffer"          "print-region"
                     "ps-print-buffer-faces" "ps-print-region-faces"
                     "ps-print-buffer"       "ps-print-region")))
        (while items
!         (easy-menu-remove-item nil '("files") (car items))
          (setq items (cdr items)))
        (setq pr-menu-print-item nil
!             pr-menu-bar (vector 'menu-bar 'files
                                  (pr-get-symbol "Print")))))
       (t
!       (easy-menu-change '("files") "Print" pr-menu-spec)))
  
      ;; Key binding
      (global-set-key [print]   'pr-ps-fast-fire)
--- 2904,2921 ----
                                  (pr-get-symbol "Printing")))))
       ;; Emacs 21
       (pr-menu-print-item
!       (easy-menu-change '("file") "Print" pr-menu-spec "print-buffer")
        (let ((items '("print-buffer"          "print-region"
                     "ps-print-buffer-faces" "ps-print-region-faces"
                     "ps-print-buffer"       "ps-print-region")))
        (while items
!         (easy-menu-remove-item nil '("file") (car items))
          (setq items (cdr items)))
        (setq pr-menu-print-item nil
!             pr-menu-bar (vector 'menu-bar 'file
                                  (pr-get-symbol "Print")))))
       (t
!       (easy-menu-change '("file") "Print" pr-menu-spec)))
  
      ;; Key binding
      (global-set-key [print]   'pr-ps-fast-fire)
***************
*** 6385,6389 ****
  (provide 'printing)
  
  
! ;;; arch-tag: 9ce9ac3f-0f60-4370-900b-1943215d9d18
  ;;; printing.el ends here
--- 6382,6386 ----
  (provide 'printing)
  
  
! ;; arch-tag: 9ce9ac3f-0f60-4370-900b-1943215d9d18
  ;;; printing.el ends here