branch: main commit 4b53ed727cd09e1f02648944cac43ccb10a155fd Merge: e5b4e11e 1f9edc5b Author: Tassilo Horn <t...@gnu.org> Commit: Tassilo Horn <t...@gnu.org>
Merge branch 'master' into elpa --- ChangeLog | 3 +++ tex.el | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 55ca5cca..91aea464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ +2015-05-08 Tassilo Horn <t...@gnu.org> + 2015-05-08 Tassilo Horn <t...@gnu.org> * tex.el (TeX-mode-syntax-table): Use paired delimiter syntax for character |. + (TeX-tree-expand): Fix docstring. 2015-05-07 Mos� Giordano <m...@gnu.org> diff --git a/tex.el b/tex.el index 0816ae28..ae4bb3d1 100644 --- a/tex.el +++ b/tex.el @@ -2349,7 +2349,7 @@ If REGEXP is nil, or \"\", an error will occur." (defun TeX-tree-expand (vars program &optional subdirs) "Return directories corresponding to the kpathsea variables VARS. -This is done calling `kpsewhich --expand-path' for each variable. +This is done calling `kpsewhich --expand-path' for the variables. PROGRAM is passed as the parameter for --progname. SUBDIRS are subdirectories which are appended to the directories of the TeX trees. Only existing directories are returned."