diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cfbc404dc51..c260af00a67 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2007-08-03 Vinicius Jose Latorre + + * printing.el: Evaluate require only during compilation. + (pr-version): New version 6.9.1. + (deactivate-mark): Replace (defvar VAR nil) by (defvar VAR). + (pr-global-menubar): Fix code. + 2007-08-03 Dan Nicolaescu * term.el (term-erase-in-display): Fix case when point is not at diff --git a/lisp/printing.el b/lisp/printing.el index 7b45d166aa3..98cb442ed00 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -6,11 +6,11 @@ ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, print, PostScript -;; Version: 6.9 +;; Version: 6.9.1 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre -(defconst pr-version "6.9" - "printing.el, v 6.9 <2007/02/11 vinicius> +(defconst pr-version "6.9.1" + "printing.el, v 6.9.1 <2007/08/02 vinicius> Please send all bug fixes and enhancements to Vinicius Jose Latorre @@ -1025,8 +1025,9 @@ Please send all bug fixes and enhancements to ;;; Code: -(require 'lpr) -(require 'ps-print) +(eval-when-compile + (require 'lpr) + (require 'ps-print)) (and (string< ps-print-version "6.6.4") @@ -1306,7 +1307,7 @@ If SUFFIX is non-nil, add that at the end of the file name." (defalias 'pr-f-read-string 'read-string) ;; GNU Emacs - (defvar deactivate-mark nil) + (defvar deactivate-mark) ;; GNU Emacs (defun pr-keep-region-active () @@ -1326,7 +1327,6 @@ If SUFFIX is non-nil, add that at the end of the file name." ;; GNU Emacs ;; Menu binding - (require 'easymenu) ;; Replace existing "print" item by "Printing" item. ;; If you're changing this file, you'll load it a second, ;; third... time, but "print" item exists only in the first load. @@ -1335,6 +1335,7 @@ If SUFFIX is non-nil, add that at the end of the file name." ;; 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) @@ -1345,6 +1346,7 @@ If SUFFIX is non-nil, add that at the end of the file name." ;; GNU Emacs 21 & 22 (t (defun pr-global-menubar (pr-menu-spec) + (require 'easymenu) (let ((menu-file (if (= emacs-major-version 21) '("menu-bar" "files") ; GNU Emacs 21 '("menu-bar" "file")))) ; GNU Emacs 22 or higher @@ -6017,9 +6019,10 @@ COMMAND.exe, COMMAND.bat and COMMAND.com in this order." ;; Printing Interface (inspired on ps-print-interface.el) -(require 'widget) -(require 'wid-edit) -(require 'cus-edit) +(eval-when-compile + (require 'cus-edit) + (require 'wid-edit) + (require 'widget)) (defvar pr-i-window-configuration nil)