(filesets-conditional-sort): Use copy-sequence, not copy-list.

(filesets-menu-path, filesets-menu-before, filesets-menu-in-menu):
Defvar them to nil if running in Emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35ffcf5e01a92c67be67377842d90e54d65c0ad4..850ba6f097987e5dee6a03a0a1c88ee962e2644a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-08  Markus Rost  <rost@math.ohio-state.edu>
+
+       * filesets.el (filesets-conditional-sort): Use copy-sequence, not
+       copy-list.
+       (filesets-menu-path, filesets-menu-before, filesets-menu-in-menu):
+       Defvar them to nil if running in Emacs.
+
 2002-05-08  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * textmodes/flyspell.el (make-flyspell-overlay): Add help text

diff --git a/lisp/filesets.el b/lisp/filesets.el
index 96bf0b9d27fce616970192eae627a0bd91874af0..fd640efdf5cc4af389526a20eb47fcfe57e97d4f 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -294,27 +294,31 @@ key is supported."
   :type 'sexp
   :group 'filesets)
 
-(when filesets-running-xemacs
-  (defcustom filesets-menu-path nil
-    "*The menu under which the filesets menu should be inserted.
+(if
+    (progn
+      (defcustom filesets-menu-path nil
+       "*The menu under which the filesets menu should be inserted.
 XEmacs specific; see `add-submenu' for documentation."
-    :set (function filesets-set-default)
-    :type 'sexp
-    :group 'filesets)
+       :set (function filesets-set-default)
+       :type 'sexp
+       :group 'filesets)
 
-  (defcustom filesets-menu-before "File"
-    "*The name of a menu before which this menu should be added.
+      (defcustom filesets-menu-before "File"
+       "*The name of a menu before which this menu should be added.
 XEmacs specific; see `add-submenu' for documentation."
-    :set (function filesets-set-default)
-    :type 'sexp
-    :group 'filesets)
+       :set (function filesets-set-default)
+       :type 'sexp
+       :group 'filesets)
 
-  (defcustom filesets-menu-in-menu nil
-    "*Use that instead of `current-menubar' as the menu to change.
+      (defcustom filesets-menu-in-menu nil
+       "*Use that instead of `current-menubar' as the menu to change.
 XEmacs specific; see `add-submenu' for documentation."
-    :set (function filesets-set-default)
-    :type 'sexp
-    :group 'filesets))
+       :set (function filesets-set-default)
+       :type 'sexp
+       :group 'filesets))
+  (defvar filesets-menu-path nil)
+  (defvar filesets-menu-before nil)
+  (defvar filesets-menu-in-menu nil))
 
 (defcustom filesets-menu-shortcuts-flag t
   "*Non-nil means to prepend menus with hopefully unique shortcuts."
@@ -1103,7 +1107,7 @@ If SIMPLY-DO-IT is non-nil, the list is sorted regardless of
                   (lambda (a b)
                     (string< (upcase (funcall fni a))
                              (upcase (funcall fni b)))))))
-       (sort (copy-list lst) fn))
+       (sort (copy-sequence lst) fn))
     lst))
 
 (defun filesets-directory-files (dir &optional