diff options
author | Carsten Dominik <[email protected]> | 2006-02-22 08:56:27 +0000 |
---|---|---|
committer | Carsten Dominik <[email protected]> | 2006-02-22 08:56:27 +0000 |
commit | c7cf105d97c6e62b36da6f4a990fcefd17e1bbb3 (patch) | |
tree | 713eab9203705f62ebed5d2a71deb74316a7ebbe /lisp | |
parent | b6e3efe044c0afb0b0a0c01c1cb846dde058adbc (diff) |
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 3 | ||||
-rw-r--r-- | lisp/textmodes/reftex.el | 44 |
2 files changed, 3 insertions, 44 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2f862ee0b7..d6b3f9ad43 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2006-02-22 Carsten Dominik <[email protected]> + * textmodes/reftex.el (reftex-locate-file): Removed duplicate + function. + * textmodes/reftex-vars.el: (reftex-try-all-extensions): New option. diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index b8ed941fca..d759aff877 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1437,50 +1437,6 @@ When DIE is non-nil, throw an error if file not found." "\\)\\'")) (files (if (string-match ext-re file) (cons file nil) - (cons (concat file def-ext) file))) - path old-path file1) - (cond - ((file-name-absolute-p file) - (setq file1 - (or - (and (car files) (file-regular-p (car files)) (car files)) - (and (cdr files) (file-regular-p (cdr files)) (cdr files))))) - ((and reftex-use-external-file-finders - (assoc type reftex-external-file-finders)) - (setq file1 (reftex-find-file-externally file type master-dir))) - (t - (while (and (null file1) rec-values) - (setq path (reftex-access-search-path - type (pop rec-values) master-dir file)) - (if (or (null old-path) - (not (eq old-path path))) - (setq old-path path - path (cons master-dir path) - file1 (or (and (car files) - (reftex-find-file-on-path - (car files) path master-dir)) - (and (cdr files) - (reftex-find-file-on-path - (cdr files) path master-dir)))))))) - (cond (file1 file1) - (die (error "No such file: %s" file) nil) - (t (message "No such file: %s (ignored)" file) nil)))) - - -;; FIXME: this still needs testing and thinking. -(defun reftex-locate-file (file type master-dir &optional die) - "Find FILE of type TYPE in MASTER-DIR or on the path associcted with TYPE. -If the file does not have any of the valid extensions for TYPE, -try first the default extension and only then the naked file name. -When DIE is non-nil, throw an error if file not found." - (let* ((rec-values (if reftex-search-unrecursed-path-first '(nil t) '(t))) - (extensions (cdr (assoc type reftex-file-extensions))) - (def-ext (car extensions)) - (ext-re (concat "\\(" - (mapconcat 'regexp-quote extensions "\\|") - "\\)\\'")) - (files (if (string-match ext-re file) - (cons file nil) (if reftex-try-all-extensions (append (mapcar (lambda (x) (concat file x)) extensions) |