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

[Richard M. Stallman]

Index: emacs/lisp/filesets.el
diff -c emacs/lisp/filesets.el:1.5 emacs/lisp/filesets.el:1.6
*** emacs/lisp/filesets.el:1.5  Sat May  4 21:43:53 2002
--- emacs/lisp/filesets.el      Sat May  4 21:55:25 2002
***************
*** 262,287 ****
    :type 'sexp
    :group 'filesets)
  
! (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)
  
  (defcustom filesets-menu-shortcuts-flag t
    "*Non-nil means to prepend menus with hopefully unique shortcuts."
--- 262,288 ----
    :type 'sexp
    :group 'filesets)
  
! (when filesets-running-xemacs
!   (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))
  
  (defcustom filesets-menu-shortcuts-flag t
    "*Non-nil means to prepend menus with hopefully unique shortcuts."
***************
*** 305,316 ****
    (if filesets-running-xemacs
        "~/.xemacs/filesets-cache.el"
        "~/.filesets-cache.el")
!   "*File to be used for saving the filesets menu between (X)Emacs
! sessions.  Set this to \"\", to disable caching of menus.
  Don't forget to check out `filesets-menu-ensure-use-cached'."
    :set (function filesets-set-default)
    :type 'file
    :group 'filesets)
  
  (defcustom filesets-menu-cache-contents
    '(filesets-be-docile-flag
--- 306,318 ----
    (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'."
    :set (function filesets-set-default)
    :type 'file
    :group 'filesets)
+ (put 'filesets-menu-cache-file 'risky-local-variable t)
  
  (defcustom filesets-menu-cache-contents
    '(filesets-be-docile-flag
***************
*** 378,385 ****
    :group 'filesets)
  
  (defcustom filesets-cache-hostname-flag nil
!   "*Non-nil means cache the hostname. If the current name differs from
! the cached one, rebuild the menu and create a new cache file."
    :set (function filesets-set-default)
    :type 'boolean
    :group 'filesets)
--- 380,388 ----
    :group 'filesets)
  
  (defcustom filesets-cache-hostname-flag nil
!   "*Non-nil means cache the hostname.
! If the current name differs from the cached one,
! rebuild the menu and create a new cache file."
    :set (function filesets-set-default)
    :type 'boolean
    :group 'filesets)
***************
*** 407,413 ****
    :type 'integer
    :group 'filesets)
  
! (defcustom filesets-browse-dir-fn 'dired
    "*A function or command used for browsing directories.
  When using an external command, \"%s\" will be replaced with the
  directory's name.
--- 410,416 ----
    :type 'integer
    :group 'filesets)
  
! (defcustom filesets-browse-dir-function 'dired
    "*A function or command used for browsing directories.
  When using an external command, \"%s\" will be replaced with the
  directory's name.
***************
*** 425,431 ****
                           :value nil))
    :group 'filesets)
  
! (defcustom filesets-open-file-fn 'filesets-find-or-display-file
    "*The function used for opening files.
  
  `filesets-find-or-display-file' ... Filesets' default function for
--- 428,434 ----
                           :value nil))
    :group 'filesets)
  
! (defcustom filesets-open-file-function 'filesets-find-or-display-file
    "*The function used for opening files.
  
  `filesets-find-or-display-file' ... Filesets' default function for
***************
*** 448,454 ****
                           :value nil))
    :group 'filesets)
  
! (defcustom filesets-save-buffer-fn 'save-buffer
    "*The function used to save a buffer.
  Caveat: Changes will take effect after rebuilding the menu."
    :set (function filesets-set-default)
--- 451,457 ----
                           :value nil))
    :group 'filesets)
  
! (defcustom filesets-save-buffer-function 'save-buffer
    "*The function used to save a buffer.
  Caveat: Changes will take effect after rebuilding the menu."
    :set (function filesets-set-default)
***************
*** 495,501 ****
  (defcustom filesets-tree-max-level 3
    "*Maximum scan depth for directory trees.
  A :tree fileset is defined by a base directory the contents of which
! will be recursively added to the menu.  filesets-tree-max-level tells up
  to which level the directory structure should be scanned/listed,
  i.e. how deep the menu should be.  Try something like
  
--- 498,504 ----
  (defcustom filesets-tree-max-level 3
    "*Maximum scan depth for directory trees.
  A :tree fileset is defined by a base directory the contents of which
! will be recursively added to the menu.  `filesets-tree-max-level' tells up
  to which level the directory structure should be scanned/listed,
  i.e. how deep the menu should be.  Try something like
  
***************
*** 551,556 ****
--- 554,560 ----
                                       (function :tag "Function"
                                                 :value nil)))))
    :group 'filesets)
+ (put 'filesets-commands 'risky-local-variable t)
  
  (defcustom filesets-external-viewers
    (let
***************
*** 694,700 ****
                                              :value :capture-output)
                                      (boolean :tag "Boolean"))))))
    :group 'filesets)
! 
  
  (defcustom filesets-ingroup-patterns
    '(("^.+\\.tex$" t
--- 698,704 ----
                                              :value :capture-output)
                                      (boolean :tag "Boolean"))))))
    :group 'filesets)
! (put 'filesets-external-viewers 'risky-local-variable t)
  
  (defcustom filesets-ingroup-patterns
    '(("^.+\\.tex$" t
***************
*** 882,887 ****
--- 886,892 ----
                                  (const :format "" :value :preprocess)
                                  (function :tag "Function")))))))
    :group 'filesets)
+ (put 'filesets-ingroup-patterns 'risky-local-variable t)
  
  (defcustom filesets-data
    nil
***************
*** 945,951 ****
  
  In conjunction with the :tree tag, :save is void.  :open refers to the
  function used for opening files in a directory, not for opening the
! directory.  For browsing directories, `filesets-browse-dir-fn' is used.
  
  Before using :ingroup, make sure that the file type is already
  defined in `filesets-ingroup-patterns'."
--- 950,956 ----
  
  In conjunction with the :tree tag, :save is void.  :open refers to the
  function used for opening files in a directory, not for opening the
! directory.  For browsing directories, `filesets-browse-dir-function' is used.
  
  Before using :ingroup, make sure that the file type is already
  defined in `filesets-ingroup-patterns'."
***************
*** 1007,1012 ****
--- 1012,1018 ----
                               :value (:open)
                               (const :format "" :value :open)
                               (function :tag "Function")))))))
+ (put 'filesets-data 'risky-local-variable t)
  
  
  (defcustom filesets-query-user-limit 15
***************
*** 1345,1363 ****
        (filesets-find-or-display-file nil (cadr (assoc viewer lst))))))
  
  (defun filesets-browser-name ()
!   "Get the directory browser's name as defined in `filesets-browse-dir-fn'."
    (cond
!    ((listp filesets-browse-dir-fn)
!     (car filesets-browse-dir-fn))
     (t
!     filesets-browse-dir-fn)))
  
  (defun filesets-browse-dir (dir)
!   "Browse DIR using `filesets-browse-dir-fn'."
!   (if (functionp filesets-browse-dir-fn)
!       (funcall filesets-browse-dir-fn dir)
!     (let ((name (car filesets-browse-dir-fn))
!         (args (format (cadr filesets-browse-dir-fn) (expand-file-name dir))))
        (with-temp-buffer
        (start-process (concat "Filesets:" name)
                       "*Filesets external directory browser*"
--- 1351,1369 ----
        (filesets-find-or-display-file nil (cadr (assoc viewer lst))))))
  
  (defun filesets-browser-name ()
!   "Get the directory browser's name as defined in 
`filesets-browse-dir-function'."
    (cond
!    ((listp filesets-browse-dir-function)
!     (car filesets-browse-dir-function))
     (t
!     filesets-browse-dir-function)))
  
  (defun filesets-browse-dir (dir)
!   "Browse DIR using `filesets-browse-dir-function'."
!   (if (functionp filesets-browse-dir-function)
!       (funcall filesets-browse-dir-function dir)
!     (let ((name (car filesets-browse-dir-function))
!         (args (format (cadr filesets-browse-dir-function) (expand-file-name 
dir))))
        (with-temp-buffer
        (start-process (concat "Filesets:" name)
                       "*Filesets external directory browser*"
***************
*** 1418,1431 ****
  Use FILESET-ENTRY for finding the open function, if provided."
    (filesets-data-get (or fileset-entry
                         (filesets-get-fileset-from-name fileset-name))
!                    ':open filesets-open-file-fn t))
  
  (defun filesets-entry-get-save-fn (fileset-name &optional fileset-entry)
    "Get the save-function for FILESET-NAME.
  Use FILESET-ENTRY for finding the save function, if provided."
    (filesets-data-get (or fileset-entry
                         (filesets-get-fileset-from-name fileset-name))
!                    ':save filesets-save-buffer-fn t))
  
  (defun filesets-entry-get-files (entry)
    "Get the file list for fileset ENTRY."
--- 1424,1437 ----
  Use FILESET-ENTRY for finding the open function, if provided."
    (filesets-data-get (or fileset-entry
                         (filesets-get-fileset-from-name fileset-name))
!                    ':open filesets-open-file-function t))
  
  (defun filesets-entry-get-save-fn (fileset-name &optional fileset-entry)
    "Get the save-function for FILESET-NAME.
  Use FILESET-ENTRY for finding the save function, if provided."
    (filesets-data-get (or fileset-entry
                         (filesets-get-fileset-from-name fileset-name))
!                    ':save filesets-save-buffer-function t))
  
  (defun filesets-entry-get-files (entry)
    "Get the file list for fileset ENTRY."