aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-02-24 23:59:40 -0800
committerGlenn Morris2011-02-24 23:59:40 -0800
commit081f76404c8c798c4e2d4d30d5a7d6fa2399a3da (patch)
tree0515d9501ca976953fbbf509e048aba5dd215439
parent8307f92370e7d86aea2c78d0dbc06c5ace9c6f11 (diff)
downloademacs-081f76404c8c798c4e2d4d30d5a7d6fa2399a3da.tar.gz
emacs-081f76404c8c798c4e2d4d30d5a7d6fa2399a3da.zip
Doc fix for bug#3577.
* doc/lispref/variables.texi (Directory Local Variables): Mention the optional mtime argument of dir-locals-set-directory-class.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/variables.texi16
2 files changed, 17 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9be1104a256..2bb357cf8a1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12011-02-25 Glenn Morris <rgm@gnu.org>
2
3 * variables.texi (Directory Local Variables): Mention the optional
4 mtime argument of dir-locals-set-directory-class. (Bug#3577)
5
12011-02-18 Eli Zaretskii <eliz@gnu.org> 62011-02-18 Eli Zaretskii <eliz@gnu.org>
2 7
3 * elisp.texi: Sync @dircategory with ../../info/dir. 8 * elisp.texi: Sync @dircategory with ../../info/dir.
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 18343b4dc85..1c86a7eb65c 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1759,12 +1759,19 @@ recursively by following the above rules; @var{list} should be of one
1759of the two forms accepted by this function in @var{variables}. 1759of the two forms accepted by this function in @var{variables}.
1760@end defun 1760@end defun
1761 1761
1762@defun dir-locals-set-directory-class directory class 1762@defun dir-locals-set-directory-class directory class &optional mtime
1763This function assigns @var{class} to all the files in @code{directory} 1763This function assigns @var{class} to all the files in @code{directory}
1764and its subdirectories. Thereafter, all the variable settings 1764and its subdirectories. Thereafter, all the variable settings
1765specified for @var{class} will be applied to any visited file in 1765specified for @var{class} will be applied to any visited file in
1766@var{directory} and its children. @var{class} must have been already 1766@var{directory} and its children. @var{class} must have been already
1767defined by @code{dir-locals-set-class-variables} 1767defined by @code{dir-locals-set-class-variables}.
1768
1769Emacs uses this function internally when it loads directory variables
1770from a @code{.dir-locals.el} file. In that case, the optional
1771argument @var{mtime} holds the file modification time (as returned by
1772@code{file-attributes}). Emacs uses this time to check stored
1773local variables are still valid. If you are assigning a class
1774directly, not via a file, this argument should be @code{nil}.
1768@end defun 1775@end defun
1769 1776
1770@defvar dir-locals-class-alist 1777@defvar dir-locals-class-alist
@@ -1774,8 +1781,9 @@ settings. It is updated by @code{dir-locals-set-class-variables}.
1774 1781
1775@defvar dir-locals-directory-cache 1782@defvar dir-locals-directory-cache
1776This alist holds directory names, their assigned class names, and 1783This alist holds directory names, their assigned class names, and
1777modification times of the associated directory local variables file. 1784modification times of the associated directory local variables file
1778It is updated by @code{dir-locals-set-directory-class}. 1785(if there is one). The function @code{dir-locals-set-directory-class}
1786updates this list.
1779@end defvar 1787@end defvar
1780 1788
1781@node Frame-Local Variables 1789@node Frame-Local Variables