aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2006-04-04 18:59:01 +0000
committerAndreas Schwab2006-04-04 18:59:01 +0000
commit704d70172ab94e9a3d1197a4f0f0f60029bb58dc (patch)
tree5e585a1e01786534f6c86da9dde72d607ae04a57
parente008f665d6db4bab3db763e16fc5cec8e0c0aeae (diff)
downloademacs-704d70172ab94e9a3d1197a4f0f0f60029bb58dc.tar.gz
emacs-704d70172ab94e9a3d1197a4f0f0f60029bb58dc.zip
Mark `left-margin', `byte-compile-dynamic-docstrings'
and `byte-compile-warnings' as `safe-local-variable'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el3
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4eea80ee200..c2d6b58c869 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-04-04 Andreas Schwab <schwab@suse.de>
2
3 * files.el: Mark `left-margin', `byte-compile-dynamic-docstrings'
4 and `byte-compile-warnings' as `safe-local-variable'.
5
12006-04-04 Dan Nicolaescu <dann@ics.uci.edu> 62006-04-04 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * man.el (Man-mode-map): Restore the \r binding. 8 * man.el (Man-mode-map): Restore the \r binding.
diff --git a/lisp/files.el b/lisp/files.el
index affb22b2586..f68907a7d7b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2334,6 +2334,8 @@ asking you for confirmation."
2334 `(mapc (lambda (pair) 2334 `(mapc (lambda (pair)
2335 (put (car pair) 'safe-local-variable (cdr pair))) 2335 (put (car pair) 'safe-local-variable (cdr pair)))
2336 '((byte-compile-dynamic . t) 2336 '((byte-compile-dynamic . t)
2337 (byte-compile-dynamic-docstrings . t)
2338 (byte-compile-warnings . t)
2337 (c-basic-offset . integerp) 2339 (c-basic-offset . integerp)
2338 (c-file-style . stringp) 2340 (c-file-style . stringp)
2339 (c-indent-level . integerp) 2341 (c-indent-level . integerp)
@@ -2346,6 +2348,7 @@ asking you for confirmation."
2346 (memq a '(nil t exclusive)))) 2348 (memq a '(nil t exclusive))))
2347 (ispell-local-dictionary . ,string-or-null) 2349 (ispell-local-dictionary . ,string-or-null)
2348 (kept-new-versions . integerp) 2350 (kept-new-versions . integerp)
2351 (left-margin . t)
2349 (no-byte-compile . t) 2352 (no-byte-compile . t)
2350 (no-update-autoloads . t) 2353 (no-update-autoloads . t)
2351 (outline-regexp . ,string-or-null) 2354 (outline-regexp . ,string-or-null)