summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2003-09-28 03:10:09 (GMT)
committerFred Drake <fdrake@acm.org>2003-09-28 03:10:09 (GMT)
commitd4956aac961e131c72e6c1e57f1c7055365e6036 (patch)
treef960947dffe75e183561d6125398d66d1a1f51ec
parent1eb41e22ab4288bef5883ee93d04e87f5b1fb5ca (diff)
downloadcpython-d4956aac961e131c72e6c1e57f1c7055365e6036.zip
cpython-d4956aac961e131c72e6c1e57f1c7055365e6036.tar.gz
cpython-d4956aac961e131c72e6c1e57f1c7055365e6036.tar.bz2
Make the "path math" more robust, and support both relative and
absolute paths as input.
-rw-r--r--Doc/tools/py2texi.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/tools/py2texi.el b/Doc/tools/py2texi.el
index b117cad..b7155ac 100644
--- a/Doc/tools/py2texi.el
+++ b/Doc/tools/py2texi.el
@@ -569,9 +569,13 @@ Do not include .ind files."
(string-match "\\.ind\\.tex$" filename)))
(setq dirs py2texi-dirs)
(while (and (not includefile) dirs)
- (setq includefile (concat path (car dirs) filename))
+ (setq includefile
+ (concat (file-name-as-directory (car dirs)) filename))
+ (if (not (file-name-absolute-p includefile))
+ (setq includefile
+ (concat (file-name-as-directory path) includefile)))
(unless (file-exists-p includefile)
- (setq includefile nil)
+ (setq includefile nil)
(setq dirs (cdr dirs))))
(if includefile
(save-restriction