[Emacs-diffs] /srv/bzr/emacs/trunk r101748: * lisp/printing.el: Drop Emacs 20 code.

[Glenn Morris]

------------------------------------------------------------
revno: 101748
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 19:17:47 -0700
message:
  * lisp/printing.el: Drop Emacs 20 code.
modified:
  lisp/ChangeLog
  lisp/printing.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-03 01:56:11 +0000
+++ b/lisp/ChangeLog    2010-10-03 02:17:47 +0000
@@ -1,5 +1,7 @@
 2010-10-03  Glenn Morris  <address@hidden>
 
+       * printing.el: Drop Emacs 20 code.
+
        * calendar/appt.el (appt-delete): Don't autoload it (you can't use it
        without having used appt.el already).
 

=== modified file 'lisp/printing.el'
--- a/lisp/printing.el  2010-01-13 08:35:10 +0000
+++ b/lisp/printing.el  2010-10-03 02:17:47 +0000
@@ -1,7 +1,7 @@
 ;;; printing.el --- printing utilities
 
-;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <address@hidden>
 ;; Maintainer: Vinicius Jose Latorre <address@hidden>
@@ -1387,20 +1387,6 @@
     (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 @@
           (t
            (easy-menu-add-item global-map menu-file
                                (easy-menu-create-menu "Print" pr-menu-spec)))
-          )))
-      )))
+          ))))
 
   (eval-and-compile
     (cond