Mercurial > emacs
changeset 110720:420fcace343a
* lisp/printing.el: Drop Emacs 20 code.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 02 Oct 2010 19:17:47 -0700 |
| parents | 57c62fb00e39 |
| children | ad5ef46bca3e |
| files | lisp/ChangeLog lisp/printing.el |
| diffstat | 2 files changed, 5 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Oct 02 19:12:55 2010 -0700 +++ b/lisp/ChangeLog Sat Oct 02 19:17:47 2010 -0700 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris <rgm@gnu.org> + * 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).
--- a/lisp/printing.el Sat Oct 02 19:12:55 2010 -0700 +++ b/lisp/printing.el Sat Oct 02 19:17:47 2010 -0700 @@ -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 <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> @@ -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