3 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbf675d8f7e..8f7c6e73504 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-19  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * progmodes/sh-script.el (sh-basic-offset):
+        * progmodes/cc-vars.el (c-syntactic-indentation)
+        (c-syntactic-indentation-in-macros): Mark as safe.
+
 2008-01-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * blank-mode.el (blank-style, blank-chars, blank-hspace-regexp)
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 7596dc60b5f..425dddf16a0 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -315,6 +315,7 @@ e.g. `c-special-indent-hook'."
   :type 'boolean
   :group 'c)
 (make-variable-buffer-local 'c-syntactic-indentation)
+(put 'c-syntactic-indentation 'safe-local-variable 'booleanp)
 
 (defcustom c-syntactic-indentation-in-macros t
   "*Enable syntactic analysis inside macros.
@@ -333,6 +334,7 @@ countered easily by surrounding the statements by a block \(or even
 better with the \"do { ... } while \(0)\" trick)."
   :type 'boolean
   :group 'c)
+(put 'c-syntactic-indentation-in-macros 'safe-local-variable 'booleanp)
 
 (defcustom-c-stylevar c-comment-only-line-offset 0
   "*Extra offset for line which contains only the start of a comment.
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index d81281dc4f2..4fe9926af8d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1205,6 +1205,7 @@ Can be set to a number, or to nil which means leave it as is."
 This value is used for the `+' and `-' symbols in an indentation variable."
   :type 'integer
   :group 'sh-indentation)
+(put 'sh-basic-offset 'safe-local-variable 'integerp)
 
 (defcustom sh-indent-comment nil
   "*How a comment line is to be indented.