[Emacs-diffs] Changes to emacs/lisp/filesets.el

[Glenn Morris]

Index: emacs/lisp/filesets.el
diff -c emacs/lisp/filesets.el:1.20 emacs/lisp/filesets.el:1.21
*** emacs/lisp/filesets.el:1.20 Sat Mar 26 02:14:35 2005
--- emacs/lisp/filesets.el      Wed Mar 30 15:12:59 2005
***************
*** 1,6 ****
  ;;; filesets.el --- handle group of files
  
! ;; Copyright (C) 2002 Free Software Foundation, Inc.
  
  ;; Author: Thomas Link <address@hidden>
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; filesets.el --- handle group of files
  
! ;; Copyright (C) 2002, 2005  Free Software Foundation, Inc.
  
  ;; Author: Thomas Link <address@hidden>
  ;; Maintainer: FSF
***************
*** 304,334 ****
    :type 'sexp
    :group 'filesets)
  
! (if filesets-running-xemacs
!     (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)
! 
!       (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)
! 
!       (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))
!   (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."
--- 304,329 ----
    :type 'sexp
    :group 'filesets)
  
! (defcustom filesets-menu-path nil
!   "*The menu under which the filesets menu should be inserted.
! See `add-submenu' for documentation."
!   :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.
! See `add-submenu' for documentation."
!   :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.
! See `add-submenu' for documentation."
!   :set (function filesets-set-default)
!   :type 'sexp
!   :group 'filesets)
  
  (defcustom filesets-menu-shortcuts-flag t
    "*Non-nil means to prepend menus with hopefully unique shortcuts."
***************
*** 351,357 ****
  (defcustom filesets-menu-cache-file
    (if filesets-running-xemacs
        "~/.xemacs/filesets-cache.el"
!       "~/.filesets-cache.el")
    "*File to be used for saving the filesets menu between sessions.
  Set this to \"\", to disable caching of menus.
  Don't forget to check out `filesets-menu-ensure-use-cached'."
--- 346,352 ----
  (defcustom filesets-menu-cache-file
    (if filesets-running-xemacs
        "~/.xemacs/filesets-cache.el"
!       "~/.emacs.d/filesets-cache.el")
    "*File to be used for saving the filesets menu between sessions.
  Set this to \"\", to disable caching of menus.
  Don't forget to check out `filesets-menu-ensure-use-cached'."
***************
*** 1070,1078 ****
  ;;; Emacs compatibility
  (eval-and-compile
    (if filesets-running-xemacs
!       (progn
!       (fset 'filesets-error 'error)
!       (fset 'filesets-add-submenu 'add-submenu))
  
      (require 'easymenu)
  
--- 1065,1071 ----
  ;;; Emacs compatibility
  (eval-and-compile
    (if filesets-running-xemacs
!       (fset 'filesets-error 'error)
  
      (require 'easymenu)
  
***************
*** 1080,1091 ****
        "`error' wrapper."
        (error (mapconcat 'identity args " ")))
  
-     ;; This should work for 21.1 Emacs
-     (defun filesets-add-submenu (menu-path submenu &optional
-                                          before in-menu)
-       "`easy-menu-define' wrapper."
-       (easy-menu-define
-       filesets-submenu global-map "Filesets menu" submenu))
      ))
  
  (defun filesets-filter-dir-names (lst &optional negative)
--- 1073,1078 ----
***************
*** 2339,2345 ****
        (filesets-menu-cache-file-save-maybe)))
    (let ((cb (current-buffer)))
      (when (not (member cb filesets-updated-buffers))
!       (filesets-add-submenu
         filesets-menu-path
         `(,filesets-menu-name
         ("# Filesets"
--- 2326,2332 ----
        (filesets-menu-cache-file-save-maybe)))
    (let ((cb (current-buffer)))
      (when (not (member cb filesets-updated-buffers))
!       (add-submenu
         filesets-menu-path
         `(,filesets-menu-name
         ("# Filesets"