(easy-menu-intern): Don't define.

(pr-get-symbol): Use easy-menu-intern only if defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dedc30af30719e09dd02937d3dcc11ef056ccedf..8caa172cba8a033de397c6b76bdf87ff4e009a5a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * printing.el (easy-menu-intern): Don't define.
+       (pr-get-symbol): Use easy-menu-intern only if defined.
+
+       * simple.el (blink-matching-open): Simplify a bit.
+       (completion-setup-function): Fix the case of partial-completion-mode
+       when the minibuffer's contents start with "-".
+       Obey completion-base-size-function even when
+       minibuffer-completing-file-name is non-nil.
+
 2005-11-16  Richard M. Stallman  <rms@gnu.org>
 
        * net/eudcb-ph.el (eudc-ph-open-session):

diff --git a/lisp/printing.el b/lisp/printing.el
index 3771871c9c82582a82b933828b15a4facd8e15f8..c199dcacc28c132858b8e04653e39a509b48da59 100644 (file)
--- 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