fix to use new easymenu

2 files changed, 21 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 226b0f86a9d..1496c47a09e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,15 @@
 
         * tooltip.el (require): Explain why CL is needed.
 
+2004-11-11  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Insert :version into defgroup (printing).  All reference
+        to Files option in menubar were changed to File.
+        (pr-version): New version number (6.8.2).
+        (pr-get-symbol): Call easy-menu-intern.
+        (pr-region-active-p): Now is a fun (it was defsubst).  To avoid
+        compilation gripes.
+
 2004-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * international/iso-cvt.el (iso-cvt-define-menu): Fix typo.
diff --git a/lisp/printing.el b/lisp/printing.el
index f466f33c830..003e6893428 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5,13 +5,13 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/09/26 22:11:24 vinicius>
+;; Time-stamp: <2004/11/11 23:54:13 vinicius>
 ;; Keywords: wp, print, PostScript
-;; Version: 6.8.1
+;; Version: 6.8.2
 ;; 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>
+(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 <viniciusjl@ig.com.br>
@@ -1099,6 +1099,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
   :tag "Printing Utilities"
   :link '(emacs-library-link :tag "Source Lisp File" "printing.el")
   :prefix "pr-"
+  :version "20"
   :group 'wp
   :group 'postscript)
 
@@ -2474,17 +2475,16 @@ See `pr-ps-printer-alist'.")
 
 (eval-and-compile
   (defun pr-get-symbol (name)
-    (or (intern-soft name)
-        (make-symbol name)))
+    (easy-menu-intern name))
 
   (cond
    ((eq ps-print-emacs-type 'emacs)     ; GNU Emacs
-    (defsubst pr-region-active-p ()
+    (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
-    (defsubst pr-region-active-p ()
+    (defun pr-region-active-p ()
       (and pr-auto-region (not zmacs-region-stays) (ps-mark-active-p)))))
 
 
@@ -2904,18 +2904,18 @@ See `pr-ps-printer-alist'.")
                                   (pr-get-symbol "Printing")))))
      ;; Emacs 21
      (pr-menu-print-item
-      (easy-menu-change '("files") "Print" pr-menu-spec "print-buffer")
+      (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 '("files") (car 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 'files
+              pr-menu-bar (vector 'menu-bar 'file
                                   (pr-get-symbol "Print")))))
      (t
-      (easy-menu-change '("files") "Print" pr-menu-spec)))
+      (easy-menu-change '("file") "Print" pr-menu-spec)))
 
     ;; Key binding
     (global-set-key [print]   'pr-ps-fast-fire)