summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-09-18 01:48:23 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-09-18 01:48:23 +0000
commitfb7d927563e41543ed9951e8d7c961f7b2f3eaa2 (patch)
tree7df4c4584536a3fab0d73b8056abe800fc185ae3 /lisp
parent088c8c37e60a2c4562a828cf0202cc820512662d (diff)
downloademacs-fb7d927563e41543ed9951e8d7c961f7b2f3eaa2.tar.gz
(css-electric-keys): electrick->electric.
(css-mode): Update correspondingly.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/textmodes/css-mode.el6
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dffaebff3c0..d451c2e9ec9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2007-09-18 Stefan Monnier <monnier@iro.umontreal.ca>
+ * textmodes/css-mode.el (css-electric-keys): electrick->electric.
+ (css-mode): Update correspondingly.
+
+2007-09-18 Stefan Monnier <monnier@iro.umontreal.ca>
+
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
* vc-hooks.el (vc-menu-entry): New var.
@@ -15,8 +20,7 @@
* vc.el: Document new VC operation `extra-menu'.
- * vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New
- function.
+ * vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New fun.
2007-09-17 Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index f686215d31c..d21559411e7 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -169,7 +169,7 @@
"word-spacing" "z-index")
"Identifiers for properties.")
-(defcustom css-electrick-keys '(?\} ?\;) ;; '()
+(defcustom css-electric-keys '(?\} ?\;) ;; '()
"Self inserting keys which should trigger re-indentation."
:type '(repeat character)
:options '((?\} ?\;)))
@@ -263,10 +263,10 @@
(set (make-local-variable 'indent-line-function) 'css-indent-line)
(set (make-local-variable 'fill-paragraph-function)
'css-fill-paragraph)
- (when css-electrick-keys
+ (when css-electric-keys
(let ((fc (make-char-table 'auto-fill-chars)))
(set-char-table-parent fc auto-fill-chars)
- (dolist (c css-electrick-keys)
+ (dolist (c css-electric-keys)
(aset fc c 'indent-according-to-mode))
(set (make-local-variable 'auto-fill-chars) fc))))