# HG changeset patch # User Juanma Barranquero # Date 1043657067 0 # Node ID 796b9b8e53c3d2e5f569088375238273dc2903d1 # Parent a53b597e29e0d00efed6d0246c843b948b887336 (filesets-file-open): Fix typo. diff -r a53b597e29e0 -r 796b9b8e53c3 lisp/filesets.el --- a/lisp/filesets.el Mon Jan 27 08:41:55 2003 +0000 +++ b/lisp/filesets.el Mon Jan 27 08:44:27 2003 +0000 @@ -163,7 +163,7 @@ fsom-rv)) (defun filesets-some (fss-pred fss-lst) - "Return non-nil if FSS-PRED is non-nil for any element of FSS-LST. + "Return non-nil if FSS-PRED is non-nil for any element of FSS-LST. Like `some', return the first value of FSS-PRED that is non-nil." (catch 'exit (dolist (fss-this fss-lst nil) @@ -179,7 +179,7 @@ (let ((fsm-test (or (plist-get fsm-keys ':test) (function equal)))) (filesets-ormap (lambda (fsm-this) - (funcall fsm-test fsm-item fsm-this)) + (funcall fsm-test fsm-item fsm-this)) fsm-lst))) ;(fset 'filesets-member 'member*) ;; or use the cl function @@ -199,7 +199,7 @@ (let ((this (shell-command-to-string (format "which --skip-alias %s 2> /dev/null | head -n 1" cmd-list)))) - (if (equal this "") + (if (equal this "") nil (file-name-nondirectory (substring this 0 (- (length this) 1)))))) @@ -353,7 +353,7 @@ (defcustom filesets-menu-cache-contents '(filesets-be-docile-flag filesets-submenus - filesets-menu-cache + filesets-menu-cache filesets-ingroup-cache) "*Stuff we want to save in `filesets-menu-cache-file'. @@ -745,7 +745,7 @@ (:get-file-name (lambda (master file) (filesets-which-file master (concat file ".sty") - (filesets-convert-path-list + (filesets-convert-path-list (or (getenv "MY_TEXINPUTS") (getenv "TEXINPUTS"))))))) ((:name "Include") @@ -753,7 +753,7 @@ (:get-file-name (lambda (master file) (filesets-which-file master (concat file ".tex") - (filesets-convert-path-list + (filesets-convert-path-list (or (getenv "MY_TEXINPUTS") (getenv "TEXINPUTS")))))) (:scan-depth 5)) @@ -763,7 +763,7 @@ (:get-file-name (lambda (master file) (filesets-which-file master (concat file ".tex") - (filesets-convert-path-list + (filesets-convert-path-list (or (getenv "MY_TEXINPUTS") (getenv "TEXINPUTS")))))) (:scan-depth 5)) @@ -772,7 +772,7 @@ (:get-file-name (lambda (master file) (filesets-which-file master (concat file ".bib") - (filesets-convert-path-list + (filesets-convert-path-list (or (getenv "MY_BIBINPUTS") (getenv "BIBINPUTS"))))))))) ("^.+\\.el$" t @@ -1066,7 +1066,7 @@ (fset 'filesets-add-submenu 'add-submenu)) (require 'easymenu) - + (defun filesets-error (class &rest args) "`error' wrapper." (error (mapconcat 'identity args " "))) @@ -1122,20 +1122,20 @@ (let ((files nil) (dirs nil)) (dolist (this (file-name-all-completions "" dir)) - (cond + (cond ((string-match "^\\.+/$" this) nil) ((string-match "[:/\\]$" this) (when (or (not match-dirs-flag) (not pattern) (string-match pattern this)) - (filesets-message 5 "Filesets: matched dir %S with pattern %S" + (filesets-message 5 "Filesets: matched dir %S with pattern %S" this pattern) (setq dirs (cons this dirs)))) (t (when (or (not pattern) (string-match pattern this)) - (filesets-message 5 "Filesets: matched file %S with pattern %S" + (filesets-message 5 "Filesets: matched file %S with pattern %S" this pattern) (setq files (cons (if full-flag (concat (file-name-as-directory dir) this) @@ -1293,7 +1293,7 @@ (filesets-get-external-viewer filename))))) (when def (filesets-alist-get def property nil t)))) - + (defun filesets-reset-filename-on-change () "Reset a buffer's filename if the buffer is being modified." (when filesets-output-buffer-flag @@ -1530,8 +1530,8 @@ (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, it's -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) @@ -1573,7 +1573,7 @@ (cond ((and (symbolp this) (fboundp this)) (let ((x (funcall this))) - (setq rv (append rv (if (listp x) x (list x)))))) + (setq rv (append rv (if (listp x) x (list x)))))) (t (setq rv (append rv (list this)))))))) @@ -1618,7 +1618,7 @@ (or (equal mode ':ingroup) (equal mode ':tree))) (filesets-get-filelist fileset mode event) - (filesets-get-filelist + (filesets-get-filelist (filesets-get-fileset-from-name name) mode event)))) (when files @@ -1644,7 +1644,7 @@ (if (equal txt "") "" " ") (format "%s" this)))))))) (cmd (concat fn " " args))) - (filesets-cmd-show-result + (filesets-cmd-show-result cmd (shell-command-to-string cmd)))) ((symbolp fn) (let ((args @@ -1800,7 +1800,7 @@ (cond (inlist (message "Filesets: '%s' is already in '%s'" this name)) - ((and (equal (filesets-entry-mode entry) ':files) + ((and (equal (filesets-entry-mode entry) ':files) this) (filesets-entry-set-files entry (cons this files) t) (filesets-set-config name 'filesets-data filesets-data)) @@ -1911,7 +1911,7 @@ (if (null (cdr x)) "" ", ")))) - (setq rv + (setq rv (concat rv (if filesets-menu-shortcuts-flag @@ -2117,7 +2117,7 @@ (append rv (if files `((,nm - [,(concat "Inclusion Group: " + [,(concat "Inclusion Group: " (file-name-nondirectory master)) (filesets-open ':ingroup ',master ',fsn)] "---" @@ -2127,7 +2127,7 @@ (mapcar (lambda (this) (setq count (+ count 1)) - (let ((ff (filesets-ingroup-collect-build-menu + (let ((ff (filesets-ingroup-collect-build-menu fs (list this) count))) (if (= (length ff) 1) (car ff) @@ -2184,7 +2184,7 @@ (let* ((x (file-name-as-directory x)) (xx (concat dir x)) (dd (filesets-build-dir-submenu-now - (+ level 1) depth entry + (+ level 1) depth entry lookup-name xx patt fd)) (nm (concat (filesets-get-shortcut count) x))) @@ -2206,7 +2206,7 @@ (append dirsmenu filesmenu)) - (filesets-get-menu-epilog `(,dir ,patt) ':tree + (filesets-get-menu-epilog `(,dir ,patt) ':tree lookup-name rebuild-flag))) nil)) @@ -2382,7 +2382,7 @@ (with-temp-buffer (dolist (this filesets-menu-cache-contents) (if (get this 'custom-type) - (progn + (progn (insert (format "(setq-default %s '%S)" this (eval this))) (when filesets-menu-ensure-use-cached (newline)