Merge from emacs-23

[gnu-emacs] / lisp / printing.el

diff --git a/lisp/printing.el b/lisp/printing.el
index 3fbf4c533559af5ca68ff2feb513a683f48d7e6c..ecbc82e01445a9b172cac4ecd8a58fe6fda8923d 100644 (file)
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1387,20 +1387,6 @@ Used by `pr-menu-bind' and `pr-update-menus'.")
     (require 'easymenu))               ; to avoid compilation gripes
 
   (eval-and-compile
-    (cond
-     ;; GNU Emacs 20
-     ((< emacs-major-version 21)
-      (defun pr-global-menubar (pr-menu-spec)
-       (require 'easymenu)
-       (easy-menu-change '("tools") "Printing" pr-menu-spec pr-menu-print-item)
-       (when pr-menu-print-item
-         (easy-menu-remove-item nil '("tools") pr-menu-print-item)
-         (setq pr-menu-print-item nil
-               pr-menu-bar (vector 'menu-bar 'tools
-                                   (pr-get-symbol "Printing")))))
-      )
-     ;; GNU Emacs 21 & 22
-     (t
       (defun pr-global-menubar (pr-menu-spec)
        (require 'easymenu)
        (let ((menu-file (if (= emacs-major-version 21)
@@ -1422,8 +1408,7 @@ Used by `pr-menu-bind' and `pr-update-menus'.")
           (t
            (easy-menu-add-item global-map menu-file
                                (easy-menu-create-menu "Print" pr-menu-spec)))
-          )))
-      )))
+          ))))
 
   (eval-and-compile
     (cond