mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +00:00
Remove spurious * in docstrings.
(filesets-running-xemacs): Remove. Use (featurep 'xemacs) instead. (filesets-conditional-sort): Remove unused arg `simply-do-it'. (filesets-ingroup-collect): Remove unused arg `depth'. (filesets-update): Remove unused arg `version'.
This commit is contained in:
Stefan Monnier
parent
bf8aa90140
commit
91cc505c59
@ -1,5 +1,11 @@
|
||||
2007-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* filesets.el: Remove spurious * in docstrings.
|
||||
(filesets-running-xemacs): Remove. Use (featurep 'xemacs) instead.
|
||||
(filesets-conditional-sort): Remove unused arg `simply-do-it'.
|
||||
(filesets-ingroup-collect): Remove unused arg `depth'.
|
||||
(filesets-update): Remove unused arg `version'.
|
||||
|
||||
* finder.el (finder-compile-keywords): Fix up comment style.
|
||||
(finder-mouse-face-on-line): previous-line -> forward-line.
|
||||
|
||||
|
||||
191
lisp/filesets.el
191
lisp/filesets.el
@ -92,9 +92,6 @@
|
||||
|
||||
|
||||
;;; 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.")
|
||||
@ -115,12 +112,11 @@
|
||||
(defvar filesets-updated-buffers nil
|
||||
"A list of buffers with updated menu bars.")
|
||||
(defvar filesets-menu-use-cached-flag nil
|
||||
"Use cached data. See `filesets-menu-ensure-use-cached' for details.")
|
||||
"Use cached data. See `filesets-menu-ensure-use-cached' for details.")
|
||||
(defvar filesets-update-cache-file-flag nil
|
||||
"Non-nil means the cache needs updating.")
|
||||
(defvar filesets-ignore-next-set-default nil
|
||||
"A list of custom variables for which the next `set-default' will be
|
||||
ignored.")
|
||||
"List of custom variables for which the next `set-default' will be ignored.")
|
||||
|
||||
(defvar filesets-output-buffer-flag nil
|
||||
"Non-nil means the current buffer is an output buffer created by filesets.
|
||||
@ -131,7 +127,7 @@ Is buffer local variable.")
|
||||
0 means no messages at all.")
|
||||
|
||||
(defvar filesets-menu-ensure-use-cached
|
||||
(and filesets-running-xemacs
|
||||
(and (featurep 'xemacs)
|
||||
(if (fboundp 'emacs-version>=)
|
||||
(not (emacs-version>= 21 5))))
|
||||
"Make sure (X)Emacs uses filesets' cache.
|
||||
@ -184,7 +180,7 @@ Like `some', return the first value of FSS-PRED that is non-nil."
|
||||
|
||||
(defun filesets-member (fsm-item fsm-lst &rest fsm-keys)
|
||||
"Find the first occurrence of FSM-ITEM in FSM-LST.
|
||||
It is supposed to work like cl's `member*'. At the moment only the :test
|
||||
It is supposed to work like cl's `member*'. At the moment only the :test
|
||||
key is supported."
|
||||
(let ((fsm-test (or (plist-get fsm-keys ':test)
|
||||
(function equal))))
|
||||
@ -214,11 +210,11 @@ key is supported."
|
||||
(file-name-nondirectory (substring this 0 (- (length this) 1))))))
|
||||
|
||||
(defun filesets-which-command (cmd)
|
||||
"Calls \"which CMD\"."
|
||||
"Call \"which CMD\"."
|
||||
(shell-command-to-string (format "which %s" cmd)))
|
||||
|
||||
(defun filesets-which-command-p (cmd)
|
||||
"Calls \"which CMD\" and returns non-nil if the command was found."
|
||||
"Call \"which CMD\" and return non-nil if the command was found."
|
||||
(when (string-match (format "\\(/[^/]+\\)?/%s" cmd)
|
||||
(filesets-which-command cmd))
|
||||
cmd))
|
||||
@ -252,7 +248,7 @@ key is supported."
|
||||
; (filesets-build-menu))
|
||||
|
||||
;; It seems this is a workaround for the XEmacs issue described in the
|
||||
;; doc-string of filesets-menu-ensure-use-cached. Under Emacs this is
|
||||
;; doc-string of filesets-menu-ensure-use-cached. Under Emacs this is
|
||||
;; essentially just `set-default'.
|
||||
(defun filesets-set-default (sym val &optional init-flag)
|
||||
"Set-default wrapper function used in conjunction with `defcustom'.
|
||||
@ -307,55 +303,55 @@ SYM to VAL and return t. If INIT-FLAG is non-nil, set with
|
||||
:version "22.1")
|
||||
|
||||
(defcustom filesets-menu-name "Filesets"
|
||||
"*Filesets' menu name."
|
||||
"Filesets' menu name."
|
||||
:set (function filesets-set-default)
|
||||
:type 'sexp
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-menu-path nil
|
||||
"*The menu under which the filesets menu should be inserted.
|
||||
"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.
|
||||
"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.
|
||||
"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."
|
||||
"Non-nil means to prepend menus with hopefully unique shortcuts."
|
||||
:set (function filesets-set-default!)
|
||||
:type 'boolean
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-menu-shortcuts-marker "%_"
|
||||
"*String for marking menu shortcuts."
|
||||
"String for marking menu shortcuts."
|
||||
:set (function filesets-set-default!)
|
||||
:type 'string
|
||||
:group 'filesets)
|
||||
|
||||
;(defcustom filesets-menu-cnvfp-flag nil
|
||||
; "*Non-nil means show \"Convert :pattern to :files\" entry for :pattern menus."
|
||||
; :set (function filesets-set-default!)
|
||||
; :type 'boolean
|
||||
; :group 'filesets)
|
||||
;;(defcustom filesets-menu-cnvfp-flag nil
|
||||
;; "*Non-nil means show \"Convert :pattern to :files\" entry for :pattern menus."
|
||||
;; :set (function filesets-set-default!)
|
||||
;; :type 'boolean
|
||||
;; :group 'filesets)
|
||||
|
||||
(defcustom filesets-menu-cache-file
|
||||
(if filesets-running-xemacs
|
||||
(if (featurep 'xemacs)
|
||||
"~/.xemacs/filesets-cache.el"
|
||||
(concat user-emacs-directory "filesets-cache.el"))
|
||||
"*File to be used for saving the filesets menu between sessions.
|
||||
"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)
|
||||
@ -368,16 +364,16 @@ Don't forget to check out `filesets-menu-ensure-use-cached'."
|
||||
filesets-submenus
|
||||
filesets-menu-cache
|
||||
filesets-ingroup-cache)
|
||||
"*Stuff we want to save in `filesets-menu-cache-file'.
|
||||
"Stuff we want to save in `filesets-menu-cache-file'.
|
||||
|
||||
Possible uses: don't save configuration data in the main startup files
|
||||
but in filesets's own cache. In this case add `filesets-data' to this
|
||||
list.
|
||||
|
||||
There is a second reason for putting `filesets-data' on this list. If
|
||||
There is a second reason for putting `filesets-data' on this list. If
|
||||
you frequently add and remove buffers on the fly to :files filesets, you
|
||||
don't need to save your customizations if `filesets-data' is being
|
||||
mirrored in the cache file. In this case the version in the cache file
|
||||
mirrored in the cache file. In this case the version in the cache file
|
||||
is the current one, and the version in your startup file will be
|
||||
silently updated later on.
|
||||
|
||||
@ -407,7 +403,7 @@ Don't forget to check out `filesets-menu-ensure-use-cached'."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-cache-fill-content-hooks nil
|
||||
"*Hooks to run when writing the contents of filesets' cache file.
|
||||
"Hooks to run when writing the contents of filesets' cache file.
|
||||
|
||||
The hook is called with the cache file as current buffer and the cursor
|
||||
at the last position. I.e. each hook has to make sure that the cursor is
|
||||
@ -429,7 +425,7 @@ Don't forget to check out `filesets-menu-ensure-use-cached'."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-cache-hostname-flag nil
|
||||
"*Non-nil means cache the hostname.
|
||||
"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)
|
||||
@ -437,16 +433,16 @@ rebuild the menu and create a new cache file."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-cache-save-often-flag nil
|
||||
"*Non-nil means save buffer on every change of the filesets menu.
|
||||
"Non-nil means save buffer on every change of the filesets menu.
|
||||
If this variable is set to nil and if Emacs crashes, the cache and
|
||||
filesets-data could get out of sync. Set this to t if this happens from
|
||||
filesets-data could get out of sync. Set this to t if this happens from
|
||||
time to time or if the fileset cache causes troubles."
|
||||
:set (function filesets-set-default)
|
||||
:type 'boolean
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-max-submenu-length 25
|
||||
"*Maximum length of submenus.
|
||||
"Maximum length of submenus.
|
||||
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 (function filesets-set-default)
|
||||
@ -454,13 +450,13 @@ will not be rewrapped if their length exceeds this value."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-max-entry-length 50
|
||||
"*Truncate names of splitted submenus to this length."
|
||||
"Truncate names of splitted submenus to this length."
|
||||
:set (function filesets-set-default)
|
||||
:type 'integer
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-browse-dir-function 'dired
|
||||
"*A function or command used for browsing directories.
|
||||
"A function or command used for browsing directories.
|
||||
When using an external command, \"%s\" will be replaced with the
|
||||
directory's name.
|
||||
|
||||
@ -478,7 +474,7 @@ Note: You have to manually rebuild the menu if you change this value."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-open-file-function 'filesets-find-or-display-file
|
||||
"*The function used for opening files.
|
||||
"The function used for opening files.
|
||||
|
||||
`filesets-find-or-display-file' ... Filesets' default function for
|
||||
visiting files. This function checks if an external viewer is defined
|
||||
@ -486,7 +482,7 @@ for a specific file type. Either this viewer, if defined, or
|
||||
`find-file' will be used to visit a file.
|
||||
|
||||
`filesets-find-file' ... An alternative function that always uses
|
||||
`find-file'. If `filesets-be-docile-flag' is true, a file, which isn't
|
||||
`find-file'. If `filesets-be-docile-flag' is true, a file, which isn't
|
||||
readable, will not be opened.
|
||||
|
||||
Caveat: Changes will take effect only after rebuilding the menu."
|
||||
@ -501,7 +497,7 @@ Caveat: Changes will take effect only after rebuilding the menu."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-save-buffer-function 'save-buffer
|
||||
"*The function used to save a buffer.
|
||||
"The function used to save a buffer.
|
||||
Caveat: Changes will take effect after rebuilding the menu."
|
||||
:set (function filesets-set-default)
|
||||
:type '(choice :tag "Function:"
|
||||
@ -512,10 +508,10 @@ Caveat: Changes will take effect after rebuilding the menu."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-find-file-delay
|
||||
(if (and filesets-running-xemacs gutter-buffers-tab-visible-p)
|
||||
(if (and (featurep 'xemacs) gutter-buffers-tab-visible-p)
|
||||
0.5
|
||||
0)
|
||||
"*Delay before calling find-file.
|
||||
"Delay before calling `find-file'.
|
||||
This is for calls via `filesets-find-or-display-file'
|
||||
or `filesets-find-file'.
|
||||
|
||||
@ -525,7 +521,7 @@ Set this to 0, if you don't use XEmacs' buffer tabs."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-be-docile-flag nil
|
||||
"*Non-nil means don't complain if a file or a directory doesn't exist.
|
||||
"Non-nil means don't complain if a file or a directory doesn't exist.
|
||||
This is useful if you want to use the same startup files in different
|
||||
computer environments."
|
||||
:set (function filesets-set-default)
|
||||
@ -533,19 +529,19 @@ computer environments."
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-sort-menu-flag t
|
||||
"*Non-nil means sort the filesets menu alphabetically."
|
||||
"Non-nil means sort the filesets menu alphabetically."
|
||||
:set (function filesets-set-default)
|
||||
:type 'boolean
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-sort-case-sensitive-flag t
|
||||
"*Non-nil means sorting of the filesete menu is case sensitive."
|
||||
"Non-nil means sorting of the filesete menu is case sensitive."
|
||||
:set (function filesets-set-default)
|
||||
:type 'boolean
|
||||
:group 'filesets)
|
||||
|
||||
(defcustom filesets-tree-max-level 3
|
||||
"*Maximum scan depth for directory trees.
|
||||
"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,
|
||||
@ -579,7 +575,7 @@ including directory trees to the menu can take a lot of memory."
|
||||
("Run Shell Command"
|
||||
filesets-cmd-shell-command
|
||||
(filesets-cmd-shell-command-getargs)))
|
||||
"*Commands to run on filesets.
|
||||
"Commands to run on filesets.
|
||||
An association list of names, functions, and an argument list (or a
|
||||
function that returns one) to be run on a filesets' files.
|
||||
|
||||
@ -607,16 +603,16 @@ the filename."
|
||||
|
||||
(defcustom filesets-external-viewers
|
||||
(let
|
||||
; ((ps-cmd (or (and (boundp 'my-ps-viewer) my-ps-viewer)
|
||||
; (filesets-select-command "ggv gv")))
|
||||
; (pdf-cmd (or (and (boundp 'my-ps-viewer) my-pdf-viewer)
|
||||
; (filesets-select-command "xpdf acroread")))
|
||||
; (dvi-cmd (or (and (boundp 'my-ps-viewer) my-dvi-viewer)
|
||||
; (filesets-select-command "xdvi tkdvi")))
|
||||
; (doc-cmd (or (and (boundp 'my-ps-viewer) my-doc-viewer)
|
||||
; (filesets-select-command "antiword")))
|
||||
; (pic-cmd (or (and (boundp 'my-ps-viewer) my-pic-viewer)
|
||||
; (filesets-select-command "gqview ee display"))))
|
||||
;; ((ps-cmd (or (and (boundp 'my-ps-viewer) my-ps-viewer)
|
||||
;; (filesets-select-command "ggv gv")))
|
||||
;; (pdf-cmd (or (and (boundp 'my-ps-viewer) my-pdf-viewer)
|
||||
;; (filesets-select-command "xpdf acroread")))
|
||||
;; (dvi-cmd (or (and (boundp 'my-ps-viewer) my-dvi-viewer)
|
||||
;; (filesets-select-command "xdvi tkdvi")))
|
||||
;; (doc-cmd (or (and (boundp 'my-ps-viewer) my-doc-viewer)
|
||||
;; (filesets-select-command "antiword")))
|
||||
;; (pic-cmd (or (and (boundp 'my-ps-viewer) my-pic-viewer)
|
||||
;; (filesets-select-command "gqview ee display"))))
|
||||
((ps-cmd "ggv")
|
||||
(pdf-cmd "xpdf")
|
||||
(dvi-cmd "xdvi")
|
||||
@ -644,7 +640,7 @@ the filename."
|
||||
((:ignore-on-open-all t)
|
||||
(:ignore-on-read-text t)
|
||||
(:constraint-flag ,pic-cmd)))))
|
||||
"*Association list of file patterns and external viewers for use with
|
||||
"Association list of file patterns and external viewers for use with
|
||||
`filesets-find-or-display-file'.
|
||||
|
||||
Has the form ((FILE-PATTERN VIEWER PROPERTIES) ...), VIEWER being either a
|
||||
@ -674,21 +670,20 @@ variables my-ps-viewer, my-pdf-viewer, my-dvi-viewer, my-pic-viewer.
|
||||
In order to view pdf or rtf files in an Emacs buffer, you could use these:
|
||||
|
||||
|
||||
\(\"^.+\\.pdf$\" \"pdftotext\"
|
||||
\(\"^.+\\\\.pdf\\\\'\" \"pdftotext\"
|
||||
\((:capture-output t)
|
||||
\(:args (\"%S - | fmt -w \" window-width))
|
||||
\(:ignore-on-read-text t)
|
||||
\(:constraintp (lambda ()
|
||||
\(and \(filesets-which-command-p \"pdftotext\")
|
||||
\(filesets-which-command-p \"fmt\"))))))
|
||||
\(\"^.+\\.rtf$\" \"rtf2htm\"
|
||||
\(\"^.+\\\\.rtf\\\\'\" \"rtf2htm\"
|
||||
\((:capture-output t)
|
||||
\(:args (\"%S 2> /dev/null | w3m -dump -T text/html\"))
|
||||
\(:ignore-on-read-text t)
|
||||
\(:constraintp (lambda ()
|
||||
\(and (filesets-which-command-p \"rtf2htm\")
|
||||
\(filesets-which-command-p \"w3m\"))))))
|
||||
"
|
||||
\(filesets-which-command-p \"w3m\"))))))"
|
||||
:set (function filesets-set-default)
|
||||
:type '(repeat :tag "Viewer"
|
||||
(list :tag "Definition"
|
||||
@ -814,7 +809,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
|
||||
emacs-wiki-directories
|
||||
nil))))))))
|
||||
|
||||
"*Inclusion group definitions.
|
||||
"Inclusion group definitions.
|
||||
|
||||
Define how to find included file according to a file's mode (being
|
||||
defined by a file pattern).
|
||||
@ -865,8 +860,8 @@ Stubs:
|
||||
|
||||
First, a stub is a file that shows up in the menu but will not be
|
||||
included in an ingroup's file listing -- i.e. filesets will never
|
||||
operate on this file automatically. Secondly, in opposition to normal
|
||||
files stubs are not scanned for new inclusion groups. This is useful if
|
||||
operate on this file automatically. Secondly, in opposition to normal
|
||||
files stubs are not scanned for new inclusion groups. This is useful if
|
||||
you want to have quick access to library headers.
|
||||
|
||||
In the menu, an asterisk is appended to the stub's name.
|
||||
@ -937,9 +932,8 @@ With duplicates removed, it would be:
|
||||
:group 'filesets)
|
||||
(put 'filesets-ingroup-patterns 'risky-local-variable t)
|
||||
|
||||
(defcustom filesets-data
|
||||
nil
|
||||
"*Fileset definitions.
|
||||
(defcustom filesets-data nil
|
||||
"Fileset definitions.
|
||||
|
||||
A fileset is either a list of files, a file pattern, a base directory
|
||||
and a search pattern (for files), or a base file. Changes to this
|
||||
@ -1065,27 +1059,27 @@ defined in `filesets-ingroup-patterns'."
|
||||
|
||||
|
||||
(defcustom filesets-query-user-limit 15
|
||||
"*Query the user before opening a fileset with that many files."
|
||||
"Query the user before opening a fileset with that many files."
|
||||
:set (function filesets-set-default)
|
||||
:type 'integer
|
||||
:group 'filesets)
|
||||
|
||||
;;; Emacs compatibility
|
||||
(eval-and-compile
|
||||
(if filesets-running-xemacs
|
||||
(if (featurep 'xemacs)
|
||||
(fset 'filesets-error 'error)
|
||||
|
||||
(require 'easymenu)
|
||||
|
||||
(defun filesets-error (class &rest args)
|
||||
"`error' wrapper."
|
||||
(error (mapconcat 'identity args " ")))
|
||||
(error "%s" (mapconcat 'identity args " ")))
|
||||
|
||||
))
|
||||
|
||||
(defun filesets-filter-dir-names (lst &optional negative)
|
||||
"Remove non-directory names from a list of strings. If NEGATIVE is
|
||||
non-nil, remove all directory names."
|
||||
"Remove non-directory names from a list of strings.
|
||||
If NEGATIVE is non-nil, remove all directory names."
|
||||
(filesets-filter-list lst
|
||||
(lambda (x)
|
||||
(and (not (string-match "^\\.+/$" x))
|
||||
@ -1093,7 +1087,7 @@ non-nil, remove all directory names."
|
||||
(not (string-match "[:/\\]$" x))
|
||||
(string-match "[:/\\]$" x))))))
|
||||
|
||||
(defun filesets-conditional-sort (lst &optional access-fn simply-do-it)
|
||||
(defun filesets-conditional-sort (lst &optional access-fn)
|
||||
"Return a sorted copy of LST, LST being a list of strings.
|
||||
If `filesets-sort-menu-flag' is nil, return LST itself.
|
||||
|
||||
@ -1116,10 +1110,11 @@ If SIMPLY-DO-IT is non-nil, the list is sorted regardless of
|
||||
|
||||
(defun filesets-directory-files (dir &optional
|
||||
pattern what full-flag match-dirs-flag)
|
||||
"Get WHAT (:files or :dirs) in DIR. If PATTERN is provided return only
|
||||
those entries matching this regular expression. If MATCH-DIRS-FLAG is
|
||||
non-nil, also match directory entries. Return full path if FULL-FLAG is
|
||||
non-nil."
|
||||
"Get WHAT (:files or :dirs) in DIR.
|
||||
If PATTERN is provided return only those entries matching this
|
||||
regular expression.
|
||||
If MATCH-DIRS-FLAG is non-nil, also match directory entries.
|
||||
Return full path if FULL-FLAG is non-nil."
|
||||
(filesets-message 2 "Filesets: scanning %S" dir)
|
||||
(cond
|
||||
((file-exists-p dir)
|
||||
@ -1262,7 +1257,7 @@ non-nil."
|
||||
filesets-external-viewers)))
|
||||
|
||||
(defun filesets-filetype-property (filename event &optional entry)
|
||||
"Returns non-nil if a file of a specific type has special flags/tags.
|
||||
"Return non-nil if a file of a specific type has special flags/tags.
|
||||
|
||||
Events (corresponding tag):
|
||||
|
||||
@ -1291,7 +1286,7 @@ on-close-all ... not used"
|
||||
nil t)))
|
||||
|
||||
(defun filesets-filetype-get-prop (property filename &optional entry)
|
||||
"Returns PROPERTY for filename -- use ENTRY if provided."
|
||||
"Return PROPERTY for filename -- use ENTRY if provided."
|
||||
(let ((def (filesets-eviewer-get-props
|
||||
(or entry
|
||||
(filesets-get-external-viewer filename)))))
|
||||
@ -1411,7 +1406,7 @@ not be opened."
|
||||
name args)))))
|
||||
|
||||
(defun filesets-get-fileset-name (something)
|
||||
"Get SOMETHING's name. (Don't ask.)"
|
||||
"Get SOMETHING's name (Don't ask)."
|
||||
(cond
|
||||
((listp something)
|
||||
(car something))
|
||||
@ -1419,11 +1414,11 @@ not be opened."
|
||||
something)))
|
||||
|
||||
(defun filesets-data-get-name (entry)
|
||||
"Access to `filesets-data'. Get the entry's name"
|
||||
"Access to `filesets-data'. Get the entry's name."
|
||||
(car entry))
|
||||
|
||||
(defun filesets-data-get-data (entry)
|
||||
"Access to `filesets-data'. Get the entry's data section"
|
||||
"Access to `filesets-data'. Get the entry's data section."
|
||||
(cdr entry))
|
||||
|
||||
(defun filesets-alist-get (alist key &optional default carp)
|
||||
@ -1534,8 +1529,8 @@ Use FILESET-ENTRY for finding the save function, if provided."
|
||||
(filesets-data-get entry ':ingroup nil t))
|
||||
|
||||
(defun filesets-file-open (open-function file-name &optional fileset-name)
|
||||
"Open FILE-NAME using OPEN-FUNCTION. If OPEN-FUNCTION is nil, its
|
||||
value will be deduced from FILESET-NAME."
|
||||
"Open FILE-NAME using OPEN-FUNCTION.
|
||||
If OPEN-FUNCTION is nil, its value will be deduced from FILESET-NAME."
|
||||
(let ((open-function (or open-function
|
||||
(filesets-entry-get-open-fn fileset-name))))
|
||||
(if (file-readable-p file-name)
|
||||
@ -1597,7 +1592,7 @@ SAVE-FUNCTION takes no argument, but works on the current buffer."
|
||||
(newline))
|
||||
|
||||
(defun filesets-run-cmd--repl-fn (arg &optional format-fn)
|
||||
"Helper function for `filesets-run-cmd'. Apply FORMAT-FN to arg.
|
||||
"Helper function for `filesets-run-cmd'. Apply FORMAT-FN to arg.
|
||||
Replace <file-name> or <<file-name>> with filename."
|
||||
(funcall format-fn (cond
|
||||
((equal arg "<file-name>")
|
||||
@ -1787,7 +1782,7 @@ Use LOOKUP-NAME for deducing the save-function, if provided."
|
||||
(filesets-error 'error "Filesets: Unknown fileset: " name))))
|
||||
|
||||
(defun filesets-add-buffer (&optional name buffer)
|
||||
"Add BUFFER (or current-buffer) to the fileset called NAME.
|
||||
"Add BUFFER (or current buffer) to the fileset called NAME.
|
||||
User will be queried, if no fileset name is provided."
|
||||
(interactive)
|
||||
(let* ((buffer (or buffer
|
||||
@ -1822,7 +1817,7 @@ User will be queried, if no fileset name is provided."
|
||||
(message "Filesets: Can't add '%s' to fileset '%s'" this name)))))))
|
||||
|
||||
(defun filesets-remove-buffer (&optional name buffer)
|
||||
"Remove BUFFER (or current-buffer) to fileset NAME.
|
||||
"Remove BUFFER (or current buffer) to fileset NAME.
|
||||
User will be queried, if no fileset name is provided."
|
||||
(interactive)
|
||||
(let* ((buffer (or buffer
|
||||
@ -2014,11 +2009,11 @@ LOOKUP-NAME is used as lookup name for retrieving fileset specific settings."
|
||||
"Access to `filesets-ingroup-patterns'. Extract remove-duplicates-flag."
|
||||
(filesets-ingroup-get-data master 1))
|
||||
|
||||
(defun filesets-ingroup-collect-finder (patt case-sencitivep)
|
||||
(defun filesets-ingroup-collect-finder (patt case-sensitivep)
|
||||
"Helper function for `filesets-ingroup-collect'. Find pattern PATT."
|
||||
(let ((cfs case-fold-search)
|
||||
(rv (progn
|
||||
(setq case-fold-search (not case-sencitivep))
|
||||
(setq case-fold-search (not case-sensitivep))
|
||||
(re-search-forward patt nil t))))
|
||||
(setq case-fold-search cfs)
|
||||
rv))
|
||||
@ -2107,8 +2102,8 @@ LOOKUP-NAME is used as lookup name for retrieving fileset specific settings."
|
||||
(filesets-message 2 "Filesets: no patterns defined for %S" master)))))
|
||||
|
||||
(defun filesets-ingroup-collect-build-menu (fs flist &optional other-count)
|
||||
"Helper function for `filesets-ingroup-collect'. Build the menu.
|
||||
FS is a fileset's name. FLIST is a list returned by
|
||||
"Helper function for `filesets-ingroup-collect'. Build the menu.
|
||||
FS is a fileset's name. FLIST is a list returned by
|
||||
`filesets-ingroup-collect-files'."
|
||||
(if (null flist)
|
||||
nil
|
||||
@ -2150,7 +2145,7 @@ FS is a fileset's name. FLIST is a list returned by
|
||||
,@(filesets-get-menu-epilog master ':ingroup fsn)))
|
||||
`([,nm (filesets-file-open nil ',master ',fsn)])))))))))
|
||||
|
||||
(defun filesets-ingroup-collect (fs remdupl-flag master &optional depth)
|
||||
(defun filesets-ingroup-collect (fs remdupl-flag master)
|
||||
"Collect names of included files & build submenu."
|
||||
(filesets-ingroup-cache-put master nil)
|
||||
(filesets-message 2 "Filesets: parsing %S" master)
|
||||
@ -2306,7 +2301,7 @@ Construct a shortcut from COUNT."
|
||||
lookup-name t)))))))))))
|
||||
|
||||
(defun filesets-remove-from-ubl (&optional buffer)
|
||||
"BUFFER or current-buffer require update of the filesets menu."
|
||||
"BUFFER or current buffer require update of the filesets menu."
|
||||
(let ((b (or buffer
|
||||
(current-buffer))))
|
||||
(if (member b filesets-updated-buffers)
|
||||
@ -2470,7 +2465,7 @@ We apologize for the inconvenience."))
|
||||
(find-file-other-window cf))
|
||||
(filesets-error 'error msg))))
|
||||
|
||||
(defun filesets-update (version cached-version)
|
||||
(defun filesets-update (cached-version)
|
||||
"Do some cleanup after updating filesets.el."
|
||||
(cond
|
||||
((or (not cached-version)
|
||||
@ -2492,7 +2487,7 @@ We apologize for the inconvenience."))
|
||||
(progn
|
||||
(setq filesets-update-cache-file-flag nil)
|
||||
t)
|
||||
(filesets-update filesets-version filesets-cache-version)))
|
||||
(filesets-update filesets-cache-version)))
|
||||
(t
|
||||
(setq filesets-update-cache-file-flag t)
|
||||
nil)))
|
||||
@ -2504,7 +2499,7 @@ We apologize for the inconvenience."))
|
||||
(defun filesets-init ()
|
||||
"Filesets initialization.
|
||||
Set up hooks, load the cache file -- if existing -- and build the menu."
|
||||
(add-hook (if filesets-running-xemacs 'activate-menubar-hook 'menu-bar-update-hook)
|
||||
(add-hook (if (featurep 'xemacs) 'activate-menubar-hook 'menu-bar-update-hook)
|
||||
(function filesets-build-menu-maybe))
|
||||
(add-hook 'kill-buffer-hook (function filesets-remove-from-ubl))
|
||||
(add-hook 'first-change-hook (function filesets-reset-filename-on-change))
|
||||
@ -2522,9 +2517,9 @@ Set up hooks, load the cache file -- if existing -- and build the menu."
|
||||
|
||||
(provide 'filesets)
|
||||
|
||||
;;; Local Variables:
|
||||
;;; sentence-end-double-space:t
|
||||
;;; End:
|
||||
;; Local Variables:
|
||||
;; sentence-end-double-space:t
|
||||
;; End:
|
||||
|
||||
;;; arch-tag: 2c03f85f-c3df-4cec-b0a3-b46fd5592d70
|
||||
;; arch-tag: 2c03f85f-c3df-4cec-b0a3-b46fd5592d70
|
||||
;;; filesets.el ends here
|
||||
|
||||
Loading…
Reference in New Issue
Block a user