aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2012-08-22 14:35:38 +0900
committerDaiki Ueno2012-08-22 14:35:38 +0900
commit37219830c704441dad626b2e555e27a7f4676d87 (patch)
tree42f8568900d8c1d9f8eee01bb25d674bd94ef945
parentcb7857924bcc4bc1a2c1cec1aa169d63447ac6f8 (diff)
downloademacs-37219830c704441dad626b2e555e27a7f4676d87.tar.gz
emacs-37219830c704441dad626b2e555e27a7f4676d87.zip
Add :safe for js indent variables.
Fixes: debbugs:12257
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/js.el5
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f8de2291db..a12390cd61f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-08-22 Daiki Ueno <ueno@unixuser.org>
2
3 * progmodes/js.el (js-indent-level, js-expr-indent-offset)
4 (js-paren-indent-offset, js-square-indent-offset)
5 (js-curly-indent-offset): Add :safe (Bug#12257).
6
12012-08-22 Edward O'Connor <hober0@gmail.com> 72012-08-22 Edward O'Connor <hober0@gmail.com>
2 8
3 * json.el (json-key-format): Add error properties. 9 * json.el (json-key-format): Add error properties.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 519e5aef2bc..d954cd53e0a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -426,18 +426,21 @@ Match group 1 is the name of the macro.")
426(defcustom js-indent-level 4 426(defcustom js-indent-level 4
427 "Number of spaces for each indentation step in `js-mode'." 427 "Number of spaces for each indentation step in `js-mode'."
428 :type 'integer 428 :type 'integer
429 :safe 'integerp
429 :group 'js) 430 :group 'js)
430 431
431(defcustom js-expr-indent-offset 0 432(defcustom js-expr-indent-offset 0
432 "Number of additional spaces for indenting continued expressions. 433 "Number of additional spaces for indenting continued expressions.
433The value must be no less than minus `js-indent-level'." 434The value must be no less than minus `js-indent-level'."
434 :type 'integer 435 :type 'integer
436 :safe 'integerp
435 :group 'js) 437 :group 'js)
436 438
437(defcustom js-paren-indent-offset 0 439(defcustom js-paren-indent-offset 0
438 "Number of additional spaces for indenting expressions in parentheses. 440 "Number of additional spaces for indenting expressions in parentheses.
439The value must be no less than minus `js-indent-level'." 441The value must be no less than minus `js-indent-level'."
440 :type 'integer 442 :type 'integer
443 :safe 'integerp
441 :group 'js 444 :group 'js
442 :version "24.1") 445 :version "24.1")
443 446
@@ -445,6 +448,7 @@ The value must be no less than minus `js-indent-level'."
445 "Number of additional spaces for indenting expressions in square braces. 448 "Number of additional spaces for indenting expressions in square braces.
446The value must be no less than minus `js-indent-level'." 449The value must be no less than minus `js-indent-level'."
447 :type 'integer 450 :type 'integer
451 :safe 'integerp
448 :group 'js 452 :group 'js
449 :version "24.1") 453 :version "24.1")
450 454
@@ -452,6 +456,7 @@ The value must be no less than minus `js-indent-level'."
452 "Number of additional spaces for indenting expressions in curly braces. 456 "Number of additional spaces for indenting expressions in curly braces.
453The value must be no less than minus `js-indent-level'." 457The value must be no less than minus `js-indent-level'."
454 :type 'integer 458 :type 'integer
459 :safe 'integerp
455 :group 'js 460 :group 'js
456 :version "24.1") 461 :version "24.1")
457 462