summaryrefslogtreecommitdiff
path: root/lisp/printing.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2005-11-16 22:44:53 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2005-11-16 22:44:53 +0000
commitbead134f40a923a6202c3b93502d2204faa5f4eb (patch)
treecdee9dcdf24ddb63d72463aebbcf78489cc71b39 /lisp/printing.el
parentb83867531a78f722b25f2436279498c129a4f842 (diff)
downloademacs-bead134f40a923a6202c3b93502d2204faa5f4eb.tar.gz
(easy-menu-intern): Don't define.
(pr-get-symbol): Use easy-menu-intern only if defined.
Diffstat (limited to 'lisp/printing.el')
-rw-r--r--lisp/printing.el12
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/printing.el b/lisp/printing.el
index 3771871c9c8..c199dcacc28 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1042,12 +1042,6 @@ Please send all bug fixes and enhancements to
;; To avoid compilation gripes
-(or (fboundp 'easy-menu-intern) ; hacked from easymenu.el
- (defsubst easy-menu-intern (s)
- (if (stringp s) (intern s) s)))
-
-
-
(or (fboundp 'subst-char-in-string) ; hacked from subr.el
(defun subst-char-in-string (fromchar tochar string &optional inplace)
"Replace FROMCHAR with TOCHAR in STRING each time it occurs.
@@ -2803,8 +2797,10 @@ See `pr-ps-printer-alist'.")
(and pr-print-using-ghostscript (not pr-spool-p)))
-(defun pr-get-symbol (name)
- (easy-menu-intern name))
+(defalias 'pr-get-symbol
+ (if (fboundp 'easy-menu-intern)
+ 'easy-menu-intern
+ (lambda (s) (if (stringp s) (intern s) s))))
(cond
((featurep 'xemacs) ; XEmacs