2 files changed, 14 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0c31005681..f7104c21885 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-30  Richard M. Stallman  <rms@gnu.org>
+
+        * filesets.el (filesets-menu-ensure-use-cached):
+        Prevent warning when emacs-version>= is undefined.
+
+        * printing.el (pr-interactive-n-up): Use string-to-number.
+
+        * emulation/tpu-mapper.el: Use eval-buffer, not eval-current-buffer.
+
+        * emacs-lisp/bytecomp.el (byte-compile-nogroup-warn):
+        Warn only when name to be defined is quoted.
+
 2005-05-30  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-toggle-breakpoint):
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 9d60f20316f..7bbf55d9823 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -132,7 +132,8 @@ Is buffer local variable.")
 
 (defvar filesets-menu-ensure-use-cached
   (and filesets-running-xemacs
-       (not (emacs-version>= 21 5)))
+       (if (fboundp 'emacs-version>=)
+           (not (emacs-version>= 21 5))))
   "Make sure (X)Emacs uses filesets' cache.
 
 Well, if you use XEmacs (prior to 21.5?) custom.el is loaded after