aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-01-19 18:32:34 +0000
committerDan Nicolaescu2008-01-19 18:32:34 +0000
commitfc9a9287570dfefe8ca48134050b00b1bda6fa89 (patch)
tree7160c6d8c214914b0d9bcccd0d261523500b2955
parentc041e2d1a31cd24b54651d1b9a993d26a0c4a021 (diff)
downloademacs-fc9a9287570dfefe8ca48134050b00b1bda6fa89.tar.gz
emacs-fc9a9287570dfefe8ca48134050b00b1bda6fa89.zip
* progmodes/sh-script.el (sh-basic-offset):
* progmodes/cc-vars.el (c-syntactic-indentation) (c-syntactic-indentation-in-macros): Mark as safe.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/cc-vars.el2
-rw-r--r--lisp/progmodes/sh-script.el1
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 @@
12008-01-19 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * progmodes/sh-script.el (sh-basic-offset):
4 * progmodes/cc-vars.el (c-syntactic-indentation)
5 (c-syntactic-indentation-in-macros): Mark as safe.
6
12008-01-19 Juanma Barranquero <lekktu@gmail.com> 72008-01-19 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * blank-mode.el (blank-style, blank-chars, blank-hspace-regexp) 9 * 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'."
315 :type 'boolean 315 :type 'boolean
316 :group 'c) 316 :group 'c)
317(make-variable-buffer-local 'c-syntactic-indentation) 317(make-variable-buffer-local 'c-syntactic-indentation)
318(put 'c-syntactic-indentation 'safe-local-variable 'booleanp)
318 319
319(defcustom c-syntactic-indentation-in-macros t 320(defcustom c-syntactic-indentation-in-macros t
320 "*Enable syntactic analysis inside macros. 321 "*Enable syntactic analysis inside macros.
@@ -333,6 +334,7 @@ countered easily by surrounding the statements by a block \(or even
333better with the \"do { ... } while \(0)\" trick)." 334better with the \"do { ... } while \(0)\" trick)."
334 :type 'boolean 335 :type 'boolean
335 :group 'c) 336 :group 'c)
337(put 'c-syntactic-indentation-in-macros 'safe-local-variable 'booleanp)
336 338
337(defcustom-c-stylevar c-comment-only-line-offset 0 339(defcustom-c-stylevar c-comment-only-line-offset 0
338 "*Extra offset for line which contains only the start of a comment. 340 "*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."
1205This value is used for the `+' and `-' symbols in an indentation variable." 1205This value is used for the `+' and `-' symbols in an indentation variable."
1206 :type 'integer 1206 :type 'integer
1207 :group 'sh-indentation) 1207 :group 'sh-indentation)
1208(put 'sh-basic-offset 'safe-local-variable 'integerp)
1208 1209
1209(defcustom sh-indent-comment nil 1210(defcustom sh-indent-comment nil
1210 "*How a comment line is to be indented. 1211 "*How a comment line is to be indented.