aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-10 00:13:54 -0700
committerGlenn Morris2012-04-10 00:13:54 -0700
commit4a427f588310fd45e29fd33eb512234a583db0bd (patch)
tree2463912f59ff621fd8a910a17000482563429efb
parent2bb0eca1ebe1ff1b9939b6350a2e5310c17a7e8c (diff)
downloademacs-4a427f588310fd45e29fd33eb512234a583db0bd.tar.gz
emacs-4a427f588310fd45e29fd33eb512234a583db0bd.zip
* lisp/files.el (dir-locals-set-class-variables): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0a64226d82..085f8f0bc0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-10 Glenn Morris <rgm@gnu.org>
2
3 * files.el (dir-locals-set-class-variables): Doc fix.
4
12012-04-09 Eli Zaretskii <eliz@gnu.org> 52012-04-09 Eli Zaretskii <eliz@gnu.org>
2 6
3 * international/characters.el: Add set-case-syntax-pair call for 7 * international/characters.el: Add set-case-syntax-pair call for
diff --git a/lisp/files.el b/lisp/files.el
index 0673b4fe56b..8df2942195e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3526,7 +3526,7 @@ LIST is a list of the form accepted by the function.
3526When a file is visited, the file's class is found. A directory 3526When a file is visited, the file's class is found. A directory
3527may be assigned a class using `dir-locals-set-directory-class'. 3527may be assigned a class using `dir-locals-set-directory-class'.
3528Then variables are set in the file's buffer according to the 3528Then variables are set in the file's buffer according to the
3529class' LIST. The list is processed in order. 3529VARIABLES list of the class. The list is processed in order.
3530 3530
3531* If the element is of the form (MAJOR-MODE . ALIST), and the 3531* If the element is of the form (MAJOR-MODE . ALIST), and the
3532 buffer's major mode is derived from MAJOR-MODE (as determined 3532 buffer's major mode is derived from MAJOR-MODE (as determined