Mercurial > emacs

changeset 66951:e21a70dc8958

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(easy-menu-intern): Don't define. (pr-get-symbol): Use easy-menu-intern only if defined.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 16 Nov 2005 22:43:28 +0000
parents deb1ca5162cd
children e4b45b2f12d7
files lisp/printing.el
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/printing.el	Wed Nov 16 22:43:16 2005 +0000
+++ b/lisp/printing.el	Wed Nov 16 22:43:28 2005 +0000
@@ -1042,12 +1042,6 @@
 ;; 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 @@
   (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