summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-02 23:21:56 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-02 23:21:56 -0800
commitbefe199d3a32075dd341b5708138385b3ecdfd8f (patch)
tree923e9038c0837ef0857be87bdc0f134fda944e6e
parent8a0709ff5d034b5667afcc0233be1f089676affc (diff)
`require' is automatically `eval-and-compile'd.
* hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el: `require' is automatically `eval-and-compile'd.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/hi-lock.el3
-rw-r--r--lisp/ps-bdf.el4
-rw-r--r--lisp/ps-mule.el3
-rw-r--r--lisp/ps-print.el4
-rw-r--r--lisp/ps-samp.el7
6 files changed, 11 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b0d50139e..826e66deb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2011-02-03 Glenn Morris <rgm@gnu.org>
+ * hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el:
+ `require' is automatically `eval-and-compile'd.
+
* net/rcirc.el (rcirc-nick-completion-format): Add :version tag.
(rcirc-log-directory, rcirc-log-flag): Move definitions before use.
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index d2c45e1132..d97e6cf4b0 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -87,8 +87,7 @@
;;; Code:
-(eval-and-compile
- (require 'font-lock))
+(require 'font-lock)
(defgroup hi-lock nil
"Interactively add and remove font-lock patterns for highlighting text."
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 608b266df8..14aee8c3ec 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -5,7 +5,6 @@
;; 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-
;; Copyright (C) 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H13PRO009
@@ -37,8 +36,7 @@
;;; Code:
-(eval-and-compile
- (require 'ps-mule))
+(require 'ps-mule)
;;;###autoload
(defcustom bdf-directory-list
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 67c12b0054..7c974d3d3c 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -88,8 +88,7 @@
;;; Code:
-(eval-and-compile
- (require 'ps-print))
+(require 'ps-print)
;;;###autoload
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 5432674410..19431c30d6 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1479,7 +1479,7 @@ Please send all bug fixes and enhancements to
;; Load XEmacs/Emacs definitions
-(eval-and-compile (require 'ps-def))
+(require 'ps-def)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -6657,7 +6657,7 @@ If FACE is not a valid face name, use default face."
;; But autoload them here to make the separation invisible.
;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "0e9db04f70d1221af96488068afa1192")
+;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "14536f28e0dcaa956901bb59ad86a875")
;;; Generated autoloads from ps-mule.el
(defvar ps-multibyte-buffer nil "\
diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el
index d4d4124993..8b652b2608 100644
--- a/lisp/ps-samp.el
+++ b/lisp/ps-samp.el
@@ -34,7 +34,7 @@
;;; Code:
-(eval-and-compile (require 'ps-print))
+(require 'ps-print)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -254,9 +254,8 @@
(eval-when-compile
(require 'cl))
-(eval-and-compile
- (require 'printing)
- (require 'zeroconf))
+(require 'printing)
+(require 'zeroconf)
;; Add a Postscript printer to the "Postscript printer" menu.
(defun ps-add-printer (service)