(menu-set-font): Use fboundp rather than functionp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4209b0f645f26e14a9dd65ad0443722e397230fc..88ffde53e51af19026a058c7c642877dae79d7bf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-13  Glenn Morris  <rgm@gnu.org>
+
+       * menu-bar.el (menu-set-font): Use fboundp rather than functionp.
+
+       * emacs-lisp/bytecomp.el (byte-compile-maybe-guarded): Doc fix.
+
 2008-06-13  Kenichi Handa  <handa@m17n.org>
 
        * cus-face.el (custom-face-attributes): Add :foundry.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index aa7cd194acf034bd1e963546a0e6ad9f16dfd469..cbb44da96641d4bd0f6001393e730a9e7e261952 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -632,7 +632,7 @@ by \"Save Options\" in Custom buffers.")
 (defun menu-set-font ()
   "Interactively select a font and make it the default."
   (interactive)
-  (let ((font (if (functionp 'x-select-font)
+  (let ((font (if (fboundp 'x-select-font)
                  (x-select-font)
                (mouse-select-font)))
        spec)