(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.
This commit is contained in:
Markus Rost 2002-05-08 15:54:59 +00:00
parent 58c6812940
commit 89fba92aaf
2 changed files with 28 additions and 17 deletions

View file

@ -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,Bm(Bk <Pavel@Janik.cz> 2002-05-08 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* textmodes/flyspell.el (make-flyspell-overlay): Add help text * textmodes/flyspell.el (make-flyspell-overlay): Add help text

View file

@ -294,27 +294,31 @@ key is supported."
:type 'sexp :type 'sexp
:group 'filesets) :group 'filesets)
(when filesets-running-xemacs (if
(defcustom filesets-menu-path nil (progn
"*The menu under which the filesets menu should be inserted. (defcustom filesets-menu-path nil
"*The menu under which the filesets menu should be inserted.
XEmacs specific; see `add-submenu' for documentation." XEmacs specific; see `add-submenu' for documentation."
:set (function filesets-set-default) :set (function filesets-set-default)
:type 'sexp :type 'sexp
:group 'filesets) :group 'filesets)
(defcustom filesets-menu-before "File" (defcustom filesets-menu-before "File"
"*The name of a menu before which this menu should be added. "*The name of a menu before which this menu should be added.
XEmacs specific; see `add-submenu' for documentation." XEmacs specific; see `add-submenu' for documentation."
:set (function filesets-set-default) :set (function filesets-set-default)
:type 'sexp :type 'sexp
:group 'filesets) :group 'filesets)
(defcustom filesets-menu-in-menu nil (defcustom filesets-menu-in-menu nil
"*Use that instead of `current-menubar' as the menu to change. "*Use that instead of `current-menubar' as the menu to change.
XEmacs specific; see `add-submenu' for documentation." XEmacs specific; see `add-submenu' for documentation."
:set (function filesets-set-default) :set (function filesets-set-default)
:type 'sexp :type 'sexp
:group 'filesets)) :group 'filesets))
(defvar filesets-menu-path nil)
(defvar filesets-menu-before nil)
(defvar filesets-menu-in-menu nil))
(defcustom filesets-menu-shortcuts-flag t (defcustom filesets-menu-shortcuts-flag t
"*Non-nil means to prepend menus with hopefully unique shortcuts." "*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) (lambda (a b)
(string< (upcase (funcall fni a)) (string< (upcase (funcall fni a))
(upcase (funcall fni b))))))) (upcase (funcall fni b)))))))
(sort (copy-list lst) fn)) (sort (copy-sequence lst) fn))
lst)) lst))
(defun filesets-directory-files (dir &optional (defun filesets-directory-files (dir &optional