diff options
Diffstat (limited to 'lisp/filesets.el')
| -rw-r--r-- | lisp/filesets.el | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/filesets.el b/lisp/filesets.el index 83a914d58cc..a8d837e7e15 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -208,7 +208,7 @@ COND-FN takes one argument: the current element." (defun filesets-reset-fileset (&optional fileset no-cache) "Reset the cached values for one or all filesets." (setq filesets-submenus (if fileset - (lax-plist-put filesets-submenus fileset nil) + (plist-put filesets-submenus fileset nil #'equal) nil)) (setq filesets-has-changed-flag t) (setq filesets-update-cache-file-flag (or filesets-update-cache-file-flag @@ -326,8 +326,8 @@ See `easy-menu-add-item' for documentation." Set this to \"\", to disable caching of menus. Don't forget to check out `filesets-menu-ensure-use-cached'." :set #'filesets-set-default - :type 'file) -(put 'filesets-menu-cache-file 'risky-local-variable t) + :type 'file + :risky t) (defcustom filesets-menu-cache-contents '(filesets-be-docile-flag @@ -414,12 +414,12 @@ time to time or if the fileset cache causes troubles." Set this value to 0 to turn menu splitting off. BTW, parts of submenus will not be rewrapped if their length exceeds this value." :set #'filesets-set-default - :type 'integer) + :type 'natnum) (defcustom filesets-max-entry-length 50 "Truncate names of split submenus to this length." :set #'filesets-set-default - :type 'integer) + :type 'natnum) (defcustom filesets-browse-dir-function #'dired "A function or command used for browsing directories. @@ -518,7 +518,7 @@ i.e. how deep the menu should be. Try something like and it should become clear what this option is about. In any case, including directory trees to the menu can take a lot of memory." :set #'filesets-set-default - :type 'integer) + :type 'natnum) (defcustom filesets-commands '(("Isearch" @@ -546,6 +546,7 @@ function that returns one) to be run on a filesets' files. The argument <file-name> or <<file-name>> (quoted) will be replaced with the filename." :set #'filesets-set-default+ + :risky t :type '(repeat :tag "Commands" (list :tag "Definition" :value ("") (string "Name") @@ -561,8 +562,7 @@ the filename." (string :tag "Quoted File Name" :value "<<file-name>>") (function :tag "Function" - :value nil)))))) -(put 'filesets-commands 'risky-local-variable t) + :value nil)))))) (defcustom filesets-external-viewers (let @@ -651,6 +651,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these: (and (filesets-which-command-p \"rtf2htm\") (filesets-which-command-p \"w3m\"))))))" :set #'filesets-set-default + :risky t :type '(repeat :tag "Viewer" (list :tag "Definition" :value ("^.+\\.suffix$" "") @@ -707,7 +708,6 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these: (const :format "" :value :capture-output) (boolean :tag "Boolean"))))))) -(put 'filesets-external-viewers 'risky-local-variable t) (defcustom filesets-ingroup-patterns '(("^.+\\.tex$" t @@ -848,6 +848,7 @@ With duplicates removed, it would be: M + A - X B" :set #'filesets-set-default + :risky t :type '(repeat :tag "Include" (list @@ -894,7 +895,6 @@ With duplicates removed, it would be: :value (:preprocess) (const :format "" :value :preprocess) (function :tag "Function")))))))) -(put 'filesets-ingroup-patterns 'risky-local-variable t) (defcustom filesets-data nil "Fileset definitions. @@ -965,6 +965,7 @@ is used. Before using :ingroup, make sure that the file type is already defined in `filesets-ingroup-patterns'." :set #'filesets-data-set-default + :risky t :type '(repeat (cons :tag "Fileset" (string :tag "Name" :value "") @@ -1021,13 +1022,12 @@ defined in `filesets-ingroup-patterns'." :value (:open) (const :format "" :value :open) (function :tag "Function"))))))) -(put 'filesets-data 'risky-local-variable t) (defcustom filesets-query-user-limit 15 "Query the user before opening a fileset with that many files." :set #'filesets-set-default - :type 'integer) + :type 'natnum) (defun filesets-filter-dir-names (lst &optional negative) @@ -1999,7 +1999,7 @@ LOOKUP-NAME is used as lookup name for retrieving fileset specific settings." (defun filesets-ingroup-cache-get (master) "Access to `filesets-ingroup-cache'." - (lax-plist-get filesets-ingroup-cache master)) + (plist-get filesets-ingroup-cache master #'equal)) (defun filesets-ingroup-cache-put (master file) "Access to `filesets-ingroup-cache'." @@ -2008,7 +2008,7 @@ LOOKUP-NAME is used as lookup name for retrieving fileset specific settings." (cons file (filesets-ingroup-cache-get emaster)) nil))) (setq filesets-ingroup-cache - (lax-plist-put filesets-ingroup-cache emaster this)))) + (plist-put filesets-ingroup-cache emaster this #'equal)))) (defun filesets-ingroup-collect-files (fs &optional remdupl-flag master depth) "Helper function for `filesets-ingroup-collect'. Collect file names." @@ -2305,12 +2305,12 @@ bottom up, set `filesets-submenus' to nil, first.)" ((null data)) (let* ((this (car data)) (name (filesets-data-get-name this)) - (cached (lax-plist-get filesets-submenus name)) + (cached (plist-get filesets-submenus name #'equal)) (submenu (or cached (filesets-build-submenu count name this)))) (unless cached (setq filesets-submenus - (lax-plist-put filesets-submenus name submenu))) + (plist-put filesets-submenus name submenu #'equal))) (unless (filesets-entry-get-dormant-flag this) (setq filesets-menu-cache (append filesets-menu-cache (list submenu)))))) |