aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2003-01-27 08:44:27 +0000
committerJuanma Barranquero2003-01-27 08:44:27 +0000
commite9bbdfc345ab93f8b71ee036fe13f35d580a8658 (patch)
tree34055cf56aafdd9fb858f041cd78acecbd907cb5
parent4f014d558fbf42f925089cedc05add9fb531da0f (diff)
downloademacs-e9bbdfc345ab93f8b71ee036fe13f35d580a8658.tar.gz
emacs-e9bbdfc345ab93f8b71ee036fe13f35d580a8658.zip
(filesets-file-open): Fix typo.
-rw-r--r--lisp/filesets.el50
1 files changed, 25 insertions, 25 deletions
diff --git a/lisp/filesets.el b/lisp/filesets.el
index e7f0358a739..49a92d6f4b6 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -163,7 +163,7 @@ COND-FN takes one argument: the current element."
163 fsom-rv)) 163 fsom-rv))
164 164
165(defun filesets-some (fss-pred fss-lst) 165(defun filesets-some (fss-pred fss-lst)
166 "Return non-nil if FSS-PRED is non-nil for any element of FSS-LST. 166 "Return non-nil if FSS-PRED is non-nil for any element of FSS-LST.
167Like `some', return the first value of FSS-PRED that is non-nil." 167Like `some', return the first value of FSS-PRED that is non-nil."
168 (catch 'exit 168 (catch 'exit
169 (dolist (fss-this fss-lst nil) 169 (dolist (fss-this fss-lst nil)
@@ -179,7 +179,7 @@ key is supported."
179 (let ((fsm-test (or (plist-get fsm-keys ':test) 179 (let ((fsm-test (or (plist-get fsm-keys ':test)
180 (function equal)))) 180 (function equal))))
181 (filesets-ormap (lambda (fsm-this) 181 (filesets-ormap (lambda (fsm-this)
182 (funcall fsm-test fsm-item fsm-this)) 182 (funcall fsm-test fsm-item fsm-this))
183 fsm-lst))) 183 fsm-lst)))
184;(fset 'filesets-member 'member*) ;; or use the cl function 184;(fset 'filesets-member 'member*) ;; or use the cl function
185 185
@@ -199,7 +199,7 @@ key is supported."
199 (let ((this (shell-command-to-string 199 (let ((this (shell-command-to-string
200 (format "which --skip-alias %s 2> /dev/null | head -n 1" 200 (format "which --skip-alias %s 2> /dev/null | head -n 1"
201 cmd-list)))) 201 cmd-list))))
202 (if (equal this "") 202 (if (equal this "")
203 nil 203 nil
204 (file-name-nondirectory (substring this 0 (- (length this) 1)))))) 204 (file-name-nondirectory (substring this 0 (- (length this) 1))))))
205 205
@@ -353,7 +353,7 @@ Don't forget to check out `filesets-menu-ensure-use-cached'."
353(defcustom filesets-menu-cache-contents 353(defcustom filesets-menu-cache-contents
354 '(filesets-be-docile-flag 354 '(filesets-be-docile-flag
355 filesets-submenus 355 filesets-submenus
356 filesets-menu-cache 356 filesets-menu-cache
357 filesets-ingroup-cache) 357 filesets-ingroup-cache)
358 "*Stuff we want to save in `filesets-menu-cache-file'. 358 "*Stuff we want to save in `filesets-menu-cache-file'.
359 359
@@ -745,7 +745,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
745 (:get-file-name (lambda (master file) 745 (:get-file-name (lambda (master file)
746 (filesets-which-file master 746 (filesets-which-file master
747 (concat file ".sty") 747 (concat file ".sty")
748 (filesets-convert-path-list 748 (filesets-convert-path-list
749 (or (getenv "MY_TEXINPUTS") 749 (or (getenv "MY_TEXINPUTS")
750 (getenv "TEXINPUTS"))))))) 750 (getenv "TEXINPUTS")))))))
751 ((:name "Include") 751 ((:name "Include")
@@ -753,7 +753,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
753 (:get-file-name (lambda (master file) 753 (:get-file-name (lambda (master file)
754 (filesets-which-file master 754 (filesets-which-file master
755 (concat file ".tex") 755 (concat file ".tex")
756 (filesets-convert-path-list 756 (filesets-convert-path-list
757 (or (getenv "MY_TEXINPUTS") 757 (or (getenv "MY_TEXINPUTS")
758 (getenv "TEXINPUTS")))))) 758 (getenv "TEXINPUTS"))))))
759 (:scan-depth 5)) 759 (:scan-depth 5))
@@ -763,7 +763,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
763 (:get-file-name (lambda (master file) 763 (:get-file-name (lambda (master file)
764 (filesets-which-file master 764 (filesets-which-file master
765 (concat file ".tex") 765 (concat file ".tex")
766 (filesets-convert-path-list 766 (filesets-convert-path-list
767 (or (getenv "MY_TEXINPUTS") 767 (or (getenv "MY_TEXINPUTS")
768 (getenv "TEXINPUTS")))))) 768 (getenv "TEXINPUTS"))))))
769 (:scan-depth 5)) 769 (:scan-depth 5))
@@ -772,7 +772,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
772 (:get-file-name (lambda (master file) 772 (:get-file-name (lambda (master file)
773 (filesets-which-file master 773 (filesets-which-file master
774 (concat file ".bib") 774 (concat file ".bib")
775 (filesets-convert-path-list 775 (filesets-convert-path-list
776 (or (getenv "MY_BIBINPUTS") 776 (or (getenv "MY_BIBINPUTS")
777 (getenv "BIBINPUTS"))))))))) 777 (getenv "BIBINPUTS")))))))))
778 ("^.+\\.el$" t 778 ("^.+\\.el$" t
@@ -1066,7 +1066,7 @@ defined in `filesets-ingroup-patterns'."
1066 (fset 'filesets-add-submenu 'add-submenu)) 1066 (fset 'filesets-add-submenu 'add-submenu))
1067 1067
1068 (require 'easymenu) 1068 (require 'easymenu)
1069 1069
1070 (defun filesets-error (class &rest args) 1070 (defun filesets-error (class &rest args)
1071 "`error' wrapper." 1071 "`error' wrapper."
1072 (error (mapconcat 'identity args " "))) 1072 (error (mapconcat 'identity args " ")))
@@ -1122,20 +1122,20 @@ non-nil."
1122 (let ((files nil) 1122 (let ((files nil)
1123 (dirs nil)) 1123 (dirs nil))
1124 (dolist (this (file-name-all-completions "" dir)) 1124 (dolist (this (file-name-all-completions "" dir))
1125 (cond 1125 (cond
1126 ((string-match "^\\.+/$" this) 1126 ((string-match "^\\.+/$" this)
1127 nil) 1127 nil)
1128 ((string-match "[:/\\]$" this) 1128 ((string-match "[:/\\]$" this)
1129 (when (or (not match-dirs-flag) 1129 (when (or (not match-dirs-flag)
1130 (not pattern) 1130 (not pattern)
1131 (string-match pattern this)) 1131 (string-match pattern this))
1132 (filesets-message 5 "Filesets: matched dir %S with pattern %S" 1132 (filesets-message 5 "Filesets: matched dir %S with pattern %S"
1133 this pattern) 1133 this pattern)
1134 (setq dirs (cons this dirs)))) 1134 (setq dirs (cons this dirs))))
1135 (t 1135 (t
1136 (when (or (not pattern) 1136 (when (or (not pattern)
1137 (string-match pattern this)) 1137 (string-match pattern this))
1138 (filesets-message 5 "Filesets: matched file %S with pattern %S" 1138 (filesets-message 5 "Filesets: matched file %S with pattern %S"
1139 this pattern) 1139 this pattern)
1140 (setq files (cons (if full-flag 1140 (setq files (cons (if full-flag
1141 (concat (file-name-as-directory dir) this) 1141 (concat (file-name-as-directory dir) this)
@@ -1293,7 +1293,7 @@ on-close-all ... not used"
1293 (filesets-get-external-viewer filename))))) 1293 (filesets-get-external-viewer filename)))))
1294 (when def 1294 (when def
1295 (filesets-alist-get def property nil t)))) 1295 (filesets-alist-get def property nil t))))
1296 1296
1297(defun filesets-reset-filename-on-change () 1297(defun filesets-reset-filename-on-change ()
1298 "Reset a buffer's filename if the buffer is being modified." 1298 "Reset a buffer's filename if the buffer is being modified."
1299 (when filesets-output-buffer-flag 1299 (when filesets-output-buffer-flag
@@ -1530,8 +1530,8 @@ Use FILESET-ENTRY for finding the save function, if provided."
1530 (filesets-data-get entry ':ingroup nil t)) 1530 (filesets-data-get entry ':ingroup nil t))
1531 1531
1532(defun filesets-file-open (open-function file-name &optional fileset-name) 1532(defun filesets-file-open (open-function file-name &optional fileset-name)
1533 "Open FILE-NAME using OPEN-FUNCTION. If OPEN-FUNCTION is nil, it's 1533 "Open FILE-NAME using OPEN-FUNCTION. If OPEN-FUNCTION is nil, its
1534value will be deduced from FILESET-NAME" 1534value will be deduced from FILESET-NAME."
1535 (let ((open-function (or open-function 1535 (let ((open-function (or open-function
1536 (filesets-entry-get-open-fn fileset-name)))) 1536 (filesets-entry-get-open-fn fileset-name))))
1537 (if (file-readable-p file-name) 1537 (if (file-readable-p file-name)
@@ -1573,7 +1573,7 @@ SAVE-FUNCTION takes no argument, but works on the current buffer."
1573 (cond 1573 (cond
1574 ((and (symbolp this) (fboundp this)) 1574 ((and (symbolp this) (fboundp this))
1575 (let ((x (funcall this))) 1575 (let ((x (funcall this)))
1576 (setq rv (append rv (if (listp x) x (list x)))))) 1576 (setq rv (append rv (if (listp x) x (list x))))))
1577 (t 1577 (t
1578 (setq rv (append rv (list this)))))))) 1578 (setq rv (append rv (list this))))))))
1579 1579
@@ -1618,7 +1618,7 @@ Replace <file-name> or <<file-name>> with filename."
1618 (or (equal mode ':ingroup) 1618 (or (equal mode ':ingroup)
1619 (equal mode ':tree))) 1619 (equal mode ':tree)))
1620 (filesets-get-filelist fileset mode event) 1620 (filesets-get-filelist fileset mode event)
1621 (filesets-get-filelist 1621 (filesets-get-filelist
1622 (filesets-get-fileset-from-name name) 1622 (filesets-get-fileset-from-name name)
1623 mode event)))) 1623 mode event))))
1624 (when files 1624 (when files
@@ -1644,7 +1644,7 @@ Replace <file-name> or <<file-name>> with filename."
1644 (if (equal txt "") "" " ") 1644 (if (equal txt "") "" " ")
1645 (format "%s" this)))))))) 1645 (format "%s" this))))))))
1646 (cmd (concat fn " " args))) 1646 (cmd (concat fn " " args)))
1647 (filesets-cmd-show-result 1647 (filesets-cmd-show-result
1648 cmd (shell-command-to-string cmd)))) 1648 cmd (shell-command-to-string cmd))))
1649 ((symbolp fn) 1649 ((symbolp fn)
1650 (let ((args 1650 (let ((args
@@ -1800,7 +1800,7 @@ User will be queried, if no fileset name is provided."
1800 (cond 1800 (cond
1801 (inlist 1801 (inlist
1802 (message "Filesets: '%s' is already in '%s'" this name)) 1802 (message "Filesets: '%s' is already in '%s'" this name))
1803 ((and (equal (filesets-entry-mode entry) ':files) 1803 ((and (equal (filesets-entry-mode entry) ':files)
1804 this) 1804 this)
1805 (filesets-entry-set-files entry (cons this files) t) 1805 (filesets-entry-set-files entry (cons this files) t)
1806 (filesets-set-config name 'filesets-data filesets-data)) 1806 (filesets-set-config name 'filesets-data filesets-data))
@@ -1911,7 +1911,7 @@ User will be queried, if no fileset name is provided."
1911 (if (null (cdr x)) 1911 (if (null (cdr x))
1912 "" 1912 ""
1913 ", ")))) 1913 ", "))))
1914 (setq rv 1914 (setq rv
1915 (concat 1915 (concat
1916 rv 1916 rv
1917 (if filesets-menu-shortcuts-flag 1917 (if filesets-menu-shortcuts-flag
@@ -2117,7 +2117,7 @@ FS is a fileset's name. FLIST is a list returned by
2117 (append rv 2117 (append rv
2118 (if files 2118 (if files
2119 `((,nm 2119 `((,nm
2120 [,(concat "Inclusion Group: " 2120 [,(concat "Inclusion Group: "
2121 (file-name-nondirectory master)) 2121 (file-name-nondirectory master))
2122 (filesets-open ':ingroup ',master ',fsn)] 2122 (filesets-open ':ingroup ',master ',fsn)]
2123 "---" 2123 "---"
@@ -2127,7 +2127,7 @@ FS is a fileset's name. FLIST is a list returned by
2127 (mapcar 2127 (mapcar
2128 (lambda (this) 2128 (lambda (this)
2129 (setq count (+ count 1)) 2129 (setq count (+ count 1))
2130 (let ((ff (filesets-ingroup-collect-build-menu 2130 (let ((ff (filesets-ingroup-collect-build-menu
2131 fs (list this) count))) 2131 fs (list this) count)))
2132 (if (= (length ff) 1) 2132 (if (= (length ff) 1)
2133 (car ff) 2133 (car ff)
@@ -2184,7 +2184,7 @@ FS is a fileset's name. FLIST is a list returned by
2184 (let* ((x (file-name-as-directory x)) 2184 (let* ((x (file-name-as-directory x))
2185 (xx (concat dir x)) 2185 (xx (concat dir x))
2186 (dd (filesets-build-dir-submenu-now 2186 (dd (filesets-build-dir-submenu-now
2187 (+ level 1) depth entry 2187 (+ level 1) depth entry
2188 lookup-name xx patt fd)) 2188 lookup-name xx patt fd))
2189 (nm (concat (filesets-get-shortcut count) 2189 (nm (concat (filesets-get-shortcut count)
2190 x))) 2190 x)))
@@ -2206,7 +2206,7 @@ FS is a fileset's name. FLIST is a list returned by
2206 (append 2206 (append
2207 dirsmenu 2207 dirsmenu
2208 filesmenu)) 2208 filesmenu))
2209 (filesets-get-menu-epilog `(,dir ,patt) ':tree 2209 (filesets-get-menu-epilog `(,dir ,patt) ':tree
2210 lookup-name rebuild-flag))) 2210 lookup-name rebuild-flag)))
2211 nil)) 2211 nil))
2212 2212
@@ -2382,7 +2382,7 @@ fileset thinks this is necessary or not."
2382 (with-temp-buffer 2382 (with-temp-buffer
2383 (dolist (this filesets-menu-cache-contents) 2383 (dolist (this filesets-menu-cache-contents)
2384 (if (get this 'custom-type) 2384 (if (get this 'custom-type)
2385 (progn 2385 (progn
2386 (insert (format "(setq-default %s '%S)" this (eval this))) 2386 (insert (format "(setq-default %s '%S)" this (eval this)))
2387 (when filesets-menu-ensure-use-cached 2387 (when filesets-menu-ensure-use-cached
2388 (newline) 2388 (newline)