From: Glenn Morris Date: Sun, 3 Oct 2010 02:17:47 +0000 (-0700) Subject: * lisp/printing.el: Drop Emacs 20 code. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~226 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6abfe35f16d4f99bd3f3240e0a2988758f7f5c68;p=emacs.git * lisp/printing.el: Drop Emacs 20 code. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b252e5b47d7..901516cfeae 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * 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). diff --git a/lisp/printing.el b/lisp/printing.el index 2cbf39f1967..aacd8d42ae4 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -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 ;; Maintainer: Vinicius Jose Latorre @@ -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