diff options
| author | Stefan Monnier | 2007-10-23 21:24:36 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-10-23 21:24:36 +0000 |
| commit | 088d6743d83c35a054846147aaac8c42df5dc40f (patch) | |
| tree | ce049c0ba7a60b1c868b68ca40eeb7f535d862f5 | |
| parent | f84f42247ebced677b8d57c0c21d7bea86fd4bb9 (diff) | |
| download | emacs-088d6743d83c35a054846147aaac8c42df5dc40f.tar.gz emacs-088d6743d83c35a054846147aaac8c42df5dc40f.zip | |
Require CL.
(comment-continue): Declare.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/textmodes/css-mode.el | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4de00ebb2b1..177aeb103c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2007-10-23 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-10-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * textmodes/css-mode.el: Require CL. | ||
| 4 | (comment-continue): Declare. | ||
| 5 | |||
| 3 | * subr.el (make-variable-frame-localizable): Remove. | 6 | * subr.el (make-variable-frame-localizable): Remove. |
| 4 | (make-variable-frame-local): Mark obsolete. | 7 | (make-variable-frame-local): Mark obsolete. |
| 5 | 8 | ||
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index d21559411e7..106148979cf 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el | |||
| @@ -33,6 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | ;;; Code: | 34 | ;;; Code: |
| 35 | 35 | ||
| 36 | (eval-when-compile (require 'cl)) | ||
| 37 | |||
| 36 | (defun css-extract-keyword-list (res) | 38 | (defun css-extract-keyword-list (res) |
| 37 | (with-temp-buffer | 39 | (with-temp-buffer |
| 38 | (url-insert-file-contents "http://www.w3.org/TR/REC-CSS2/css2.txt") | 40 | (url-insert-file-contents "http://www.w3.org/TR/REC-CSS2/css2.txt") |
| @@ -270,6 +272,8 @@ | |||
| 270 | (aset fc c 'indent-according-to-mode)) | 272 | (aset fc c 'indent-according-to-mode)) |
| 271 | (set (make-local-variable 'auto-fill-chars) fc)))) | 273 | (set (make-local-variable 'auto-fill-chars) fc)))) |
| 272 | 274 | ||
| 275 | (defvar comment-continue) | ||
| 276 | |||
| 273 | (defun css-fill-paragraph (&optional justify) | 277 | (defun css-fill-paragraph (&optional justify) |
| 274 | (save-excursion | 278 | (save-excursion |
| 275 | (let ((ppss (syntax-ppss)) | 279 | (let ((ppss (syntax-ppss)) |
| @@ -286,7 +290,7 @@ | |||
| 286 | ;; css-mode but for all modes. | 290 | ;; css-mode but for all modes. |
| 287 | (save-restriction | 291 | (save-restriction |
| 288 | (narrow-to-region (nth 8 ppss) eol) | 292 | (narrow-to-region (nth 8 ppss) eol) |
| 289 | (comment-normalize-vars) | 293 | (comment-normalize-vars) ;Will define comment-continue. |
| 290 | (let ((fill-paragraph-function nil) | 294 | (let ((fill-paragraph-function nil) |
| 291 | (paragraph-separate | 295 | (paragraph-separate |
| 292 | (if (and comment-continue | 296 | (if (and comment-continue |