diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
| commit | ecb21060d5c1752d41d7a742be565c59b5fcb855 (patch) | |
| tree | fadebcd18a69457a1d564f738c3f9bdcf512ab4b /lisp/textmodes/css-mode.el | |
| parent | 42af7493ae7e7a14ee508800c7fa75b65a94c143 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.gz emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.bz2 emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'lisp/textmodes/css-mode.el')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index b00fc356cce..079c362b504 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -33,6 +33,10 @@ ;;; Code: +(defgroup css nil + "Cascading Style Sheets (CSS) editing mode." + :group 'languages) + (defun css-extract-keyword-list (res) (with-temp-buffer (url-insert-file-contents "http://www.w3.org/TR/REC-CSS2/css2.txt") @@ -169,10 +173,11 @@ "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 '((?\} ?\;))) + :options '((?\} ?\;)) + :group 'css) (defvar css-mode-syntax-table (let ((st (make-syntax-table))) @@ -207,9 +212,11 @@ (defconst css-name-re (concat css-nmchar-re "+")) (defface css-selector '((t :inherit font-lock-function-name-face)) - "Face to use for selectors.") + "Face to use for selectors." + :group 'css) (defface css-property '((t :inherit font-lock-variable-name-face)) - "Face to use for properties.") + "Face to use for properties." + :group 'css) (defvar css-font-lock-keywords `(("!\\s-*important" . font-lock-builtin-face) @@ -263,10 +270,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)))) @@ -390,7 +397,8 @@ (defcustom css-indent-offset 4 "Basic size of one indentation step." - :type 'integer) + :type 'integer + :group 'css) (defun css-indent-calculate () (let ((ppss (syntax-ppss)) |