diff options
| author | Stefan Monnier | 2007-09-18 01:48:23 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-09-18 01:48:23 +0000 |
| commit | fb7d927563e41543ed9951e8d7c961f7b2f3eaa2 (patch) | |
| tree | 7df4c4584536a3fab0d73b8056abe800fc185ae3 | |
| parent | 088c8c37e60a2c4562a828cf0202cc820512662d (diff) | |
| download | emacs-fb7d927563e41543ed9951e8d7c961f7b2f3eaa2.tar.gz emacs-fb7d927563e41543ed9951e8d7c961f7b2f3eaa2.zip | |
(css-electric-keys): electrick->electric.
(css-mode): Update correspondingly.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 6 |
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 @@ | |||
| 1 | 2007-09-18 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-09-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * textmodes/css-mode.el (css-electric-keys): electrick->electric. | ||
| 4 | (css-mode): Update correspondingly. | ||
| 5 | |||
| 6 | 2007-09-18 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 7 | |||
| 3 | * vc-arch.el (vc-arch-extra-menu-map): New var and fun. | 8 | * vc-arch.el (vc-arch-extra-menu-map): New var and fun. |
| 4 | 9 | ||
| 5 | * vc-hooks.el (vc-menu-entry): New var. | 10 | * vc-hooks.el (vc-menu-entry): New var. |
| @@ -15,8 +20,7 @@ | |||
| 15 | 20 | ||
| 16 | * vc.el: Document new VC operation `extra-menu'. | 21 | * vc.el: Document new VC operation `extra-menu'. |
| 17 | 22 | ||
| 18 | * vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New | 23 | * vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New fun. |
| 19 | function. | ||
| 20 | 24 | ||
| 21 | 2007-09-17 Dan Nicolaescu <dann@ics.uci.edu> | 25 | 2007-09-17 Dan Nicolaescu <dann@ics.uci.edu> |
| 22 | 26 | ||
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 @@ | |||
| 169 | "word-spacing" "z-index") | 169 | "word-spacing" "z-index") |
| 170 | "Identifiers for properties.") | 170 | "Identifiers for properties.") |
| 171 | 171 | ||
| 172 | (defcustom css-electrick-keys '(?\} ?\;) ;; '() | 172 | (defcustom css-electric-keys '(?\} ?\;) ;; '() |
| 173 | "Self inserting keys which should trigger re-indentation." | 173 | "Self inserting keys which should trigger re-indentation." |
| 174 | :type '(repeat character) | 174 | :type '(repeat character) |
| 175 | :options '((?\} ?\;))) | 175 | :options '((?\} ?\;))) |
| @@ -263,10 +263,10 @@ | |||
| 263 | (set (make-local-variable 'indent-line-function) 'css-indent-line) | 263 | (set (make-local-variable 'indent-line-function) 'css-indent-line) |
| 264 | (set (make-local-variable 'fill-paragraph-function) | 264 | (set (make-local-variable 'fill-paragraph-function) |
| 265 | 'css-fill-paragraph) | 265 | 'css-fill-paragraph) |
| 266 | (when css-electrick-keys | 266 | (when css-electric-keys |
| 267 | (let ((fc (make-char-table 'auto-fill-chars))) | 267 | (let ((fc (make-char-table 'auto-fill-chars))) |
| 268 | (set-char-table-parent fc auto-fill-chars) | 268 | (set-char-table-parent fc auto-fill-chars) |
| 269 | (dolist (c css-electrick-keys) | 269 | (dolist (c css-electric-keys) |
| 270 | (aset fc c 'indent-according-to-mode)) | 270 | (aset fc c 'indent-according-to-mode)) |
| 271 | (set (make-local-variable 'auto-fill-chars) fc)))) | 271 | (set (make-local-variable 'auto-fill-chars) fc)))) |
| 272 | 272 | ||