aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-05-14 10:42:39 +0000
committerJuanma Barranquero2007-05-14 10:42:39 +0000
commit59831679d91740dfe1d22cd057e047265fc52509 (patch)
tree0c721cc963a4bce7cc84cb217ebc6d1dada762d7
parentc6f33bac6aa79e01e5f450f1973aab5566d01d6a (diff)
downloademacs-59831679d91740dfe1d22cd057e047265fc52509.tar.gz
emacs-59831679d91740dfe1d22cd057e047265fc52509.zip
(mode-require-final-newline, require-final-newline, enable-local-variables,
enable-local-eval): Doc fixes.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el14
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32a307cb809..58283c5cfee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-05-14 Juanma Barranquero <lekktu@gmail.com>
2
3 * files.el (mode-require-final-newline, require-final-newline)
4 (enable-local-variables, enable-local-eval): Doc fixes.
5
12007-05-13 Vinicius Jose Latorre <viniciusjl@ig.com.br> 62007-05-13 Vinicius Jose Latorre <viniciusjl@ig.com.br>
2 7
3 * ps-print.el: Use default color when foreground or background color 8 * ps-print.el: Use default color when foreground or background color
diff --git a/lisp/files.el b/lisp/files.el
index 85478ac40a0..a2d9192246a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -287,7 +287,7 @@ A value of t means do this only when the file is about to be saved.
287A value of `visit' means do this right after the file is visited. 287A value of `visit' means do this right after the file is visited.
288A value of `visit-save' means do it at both of those times. 288A value of `visit-save' means do it at both of those times.
289Any other non-nil value means ask user whether to add a newline, when saving. 289Any other non-nil value means ask user whether to add a newline, when saving.
290nil means don't add newlines. 290A value of nil means don't add newlines.
291 291
292Certain major modes set this locally to the value obtained 292Certain major modes set this locally to the value obtained
293from `mode-require-final-newline'." 293from `mode-require-final-newline'."
@@ -309,10 +309,10 @@ A value of `visit' means do this right after the file is visited.
309A value of `visit-save' means do it at both of those times. 309A value of `visit-save' means do it at both of those times.
310Any other non-nil value means ask user whether to add a newline, when saving. 310Any other non-nil value means ask user whether to add a newline, when saving.
311 311
312nil means do not add newlines. That is a risky choice in this variable 312A value of nil means do not add newlines. That is a risky choice in this
313since this value is used for modes for files that ought to have final newlines. 313variable since this value is used for modes for files that ought to have
314So if you set this to nil, you must explicitly check and add 314final newlines. So if you set this to nil, you must explicitly check and
315a final newline, whenever you save a file that really needs one." 315add a final newline, whenever you save a file that really needs one."
316 :type '(choice (const :tag "When visiting" visit) 316 :type '(choice (const :tag "When visiting" visit)
317 (const :tag "When saving" t) 317 (const :tag "When saving" t)
318 (const :tag "When visiting or saving" visit-save) 318 (const :tag "When visiting or saving" visit-save)
@@ -459,7 +459,7 @@ not safe, Emacs queries you, once, whether to set them all.
459:safe means set the safe variables, and ignore the rest. 459:safe means set the safe variables, and ignore the rest.
460:all means set all variables, whether safe or not. 460:all means set all variables, whether safe or not.
461 (Don't set it permanently to :all.) 461 (Don't set it permanently to :all.)
462nil means always ignore the file local variables. 462A value of nil means always ignore the file local variables.
463 463
464Any other value means always query you once whether to set them all. 464Any other value means always query you once whether to set them all.
465\(When you say yes to certain values, they are remembered as safe, but 465\(When you say yes to certain values, they are remembered as safe, but
@@ -491,7 +491,7 @@ specified in a -*- line.")
491 "Control processing of the \"variable\" `eval' in a file's local variables. 491 "Control processing of the \"variable\" `eval' in a file's local variables.
492The value can be t, nil or something else. 492The value can be t, nil or something else.
493A value of t means obey `eval' variables; 493A value of t means obey `eval' variables;
494nil means ignore them; anything else means query." 494A value of nil means ignore them; anything else means query."
495 :type '(choice (const :tag "Obey" t) 495 :type '(choice (const :tag "Obey" t)
496 (const :tag "Ignore" nil) 496 (const :tag "Ignore" nil)
497 (other :tag "Query" other)) 497 (other :tag "Query" other))