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

[Richard M. Stallman]

Index: emacs/lisp/filesets.el
diff -c emacs/lisp/filesets.el:1.3 emacs/lisp/filesets.el:1.4
*** emacs/lisp/filesets.el:1.3  Mon Apr 29 13:47:04 2002
--- emacs/lisp/filesets.el      Mon Apr 29 21:58:43 2002
***************
*** 84,92 ****
  
  ;;; Some variables
  (eval-and-compile
!   (unless (boundp 'filesets-running-xemacs)
!     (defvar filesets-running-xemacs (string-match "XEmacs\\|Lucid" 
emacs-version)
!       "Non-nil means we are running XEmacs.")))
  
  (defvar filesets-menu-cache nil
    "The whole filesets menu.")
--- 84,91 ----
  
  ;;; Some variables
  (eval-and-compile
!   (defvar filesets-running-xemacs (string-match "XEmacs\\|Lucid" 
emacs-version)
!     "Non-nil means we are running XEmacs."))
  
  (defvar filesets-menu-cache nil
    "The whole filesets menu.")
***************
*** 97,105 ****
  
  (defvar filesets-ingroup-cache nil
    "A plist containing files and their ingroup data.")
! (defvar filesets-ingroup-paths nil
!   "A temporary list of path already processed when searching for
! included files.")
  
  (defvar filesets-has-changed-flag t
    "Non-nil means some fileset definition has changed.")
--- 96,103 ----
  
  (defvar filesets-ingroup-cache nil
    "A plist containing files and their ingroup data.")
! (defvar filesets-ingroup-files nil
!   "List of files already processed when searching for included files.")
  
  (defvar filesets-has-changed-flag t
    "Non-nil means some fileset definition has changed.")
***************
*** 1018,1060 ****
    :group 'filesets)
  
  
- (defun filesets-error (class &rest args)
-   "`error' wrapper."
-   (error (apply 'concat
-               (mapcar (lambda (x) (format "%s " x))
-                       args))))
- 
  ;;; Emacs compatibility
  (eval-and-compile
    (if filesets-running-xemacs
        (progn
        (fset 'filesets-add-submenu 'add-submenu))
-     
-     (progn
  
!       (require 'easymenu)
        
!       ;; 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))
!       )))
! 
! ;;; helper
! ;(defmacro filesets-testing (feature messagep &rest body)
! ;  (cond
! ;   ((equal filesets-version "testing")
! ;    `(progn ,@body))
! ;   (messagep
! ;    (message "Filestats: feature `%s' is disabled." feature)
! ;    nil)
! ;   (t
! ;    nil)))
! 
! ;(defun filesets-not-yet-implemented (feature)
! ;  (message "Filestats: `%s' is not yet implemented." feature))
  
  (defun filesets-filter-dir-names (lst &optional negative)
    "Remove non-directory names from a list of strings. If NEGATIVE is
--- 1016,1041 ----
    :group 'filesets)
  
  
  ;;; Emacs compatibility
  (eval-and-compile
    (if filesets-running-xemacs
        (progn
+       (fset 'filesets-error 'error)
        (fset 'filesets-add-submenu 'add-submenu))
  
!     (require 'easymenu)
        
!     (defun filesets-error (class &rest args)
!       "`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)
    "Remove non-directory names from a list of strings. If NEGATIVE is
***************
*** 1352,1358 ****
        (filesets-spawn-external-viewer file external-viewer-def)
        (filesets-find-file file))))
  
! (defun fsfind-file-using ()
    "Select a viewer and call `filesets-find-or-display-file'."
    (interactive)
    (let* ((lst (mapcar (lambda (this)
--- 1333,1339 ----
        (filesets-spawn-external-viewer file external-viewer-def)
        (filesets-find-file file))))
  
! (defun filesets-find-file-using ()
    "Select a viewer and call `filesets-find-or-display-file'."
    (interactive)
    (let* ((lst (mapcar (lambda (this)
***************
*** 2040,2046 ****
                                 (not (member f flist))
                                 (or (not remdupl-flag)
                                     (not (member*
!                                          f filesets-ingroup-paths
                                           :test 'filesets-files-equalp))))
                        (let ((no-stub-flag
                               (and (not this-stub-flag)
--- 2021,2027 ----
                                 (not (member f flist))
                                 (or (not remdupl-flag)
                                     (not (member*
!                                          f filesets-ingroup-files
                                           :test 'filesets-files-equalp))))
                        (let ((no-stub-flag
                               (and (not this-stub-flag)
***************
*** 2049,2056 ****
                                      t))))
                          (setq count (+ count 1))
                          (setq flist (cons f flist))
!                         (setq filesets-ingroup-paths
!                               (cons f filesets-ingroup-paths))
                          (when no-stub-flag
                            (filesets-ingroup-cache-put master f))
                          (setq lst (append lst (list f))))))))
--- 2030,2037 ----
                                      t))))
                          (setq count (+ count 1))
                          (setq flist (cons f flist))
!                         (setq filesets-ingroup-files
!                               (cons f filesets-ingroup-files))
                          (when no-stub-flag
                            (filesets-ingroup-cache-put master f))
                          (setq lst (append lst (list f))))))))
***************
*** 2121,2127 ****
    "Build a :ingroup submenu for file MASTER."
    (if (file-readable-p master)
        (let ((remdupl-flag  (filesets-ingroup-get-remdupl-p master)))
!       (setq filesets-ingroup-paths (list master))
        (filesets-ingroup-collect lookup-name remdupl-flag master))
      (if filesets-be-docile-flag
        (progn
--- 2102,2108 ----
    "Build a :ingroup submenu for file MASTER."
    (if (file-readable-p master)
        (let ((remdupl-flag  (filesets-ingroup-get-remdupl-p master)))
!       (setq filesets-ingroup-files (list master))
        (filesets-ingroup-collect lookup-name remdupl-flag master))
      (if filesets-be-docile-flag
        (progn