aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emacs-lisp/smie.el10
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 102e84d4cfa..42d6c7ece03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12010-11-01 Glenn Morris <rgm@gnu.org> 12010-11-01 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/smie.el (smie): New custom group.
4 (smie-blink-matching-inners, smie-indent-basic): Add :group.
5
3 * faces.el (xw-defined-colors, x-setup-function-keys): 6 * faces.el (xw-defined-colors, x-setup-function-keys):
4 * mouse-sel.el (x-select-text): 7 * mouse-sel.el (x-select-text):
5 * term/w32console.el (x-setup-function-keys): Update declarations. 8 * term/w32console.el (x-setup-function-keys): Update declarations.
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 6cd434ff790..afb2834414a 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -70,6 +70,10 @@
70 70
71(eval-when-compile (require 'cl)) 71(eval-when-compile (require 'cl))
72 72
73(defgroup smie nil
74 "Simple Minded Indentation Engine."
75 :group 'languages)
76
73(defvar comment-continue) 77(defvar comment-continue)
74(declare-function comment-string-strip "newcomment" (str beforep afterp)) 78(declare-function comment-string-strip "newcomment" (str beforep afterp))
75 79
@@ -790,7 +794,8 @@ I.e. a good choice can be:
790(defcustom smie-blink-matching-inners t 794(defcustom smie-blink-matching-inners t
791 "Whether SMIE should blink to matching opener for inner keywords. 795 "Whether SMIE should blink to matching opener for inner keywords.
792If non-nil, it will blink not only for \"begin..end\" but also for \"if...else\"." 796If non-nil, it will blink not only for \"begin..end\" but also for \"if...else\"."
793 :type 'boolean) 797 :type 'boolean
798 :group 'smie)
794 799
795(defun smie-blink-matching-check (start end) 800(defun smie-blink-matching-check (start end)
796 (save-excursion 801 (save-excursion
@@ -866,7 +871,8 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'.
866 871
867(defcustom smie-indent-basic 4 872(defcustom smie-indent-basic 4
868 "Basic amount of indentation." 873 "Basic amount of indentation."
869 :type 'integer) 874 :type 'integer
875 :group 'smie)
870 876
871(defvar smie-rules-function 'ignore 877(defvar smie-rules-function 'ignore
872 "Function providing the indentation rules. 878 "Function providing the indentation rules.