[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 42c9969: Fixes: debbugs:19815
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 42c9969: Fixes: debbugs:19815 |
Date: |
Mon, 09 Feb 2015 17:26:18 +0000 |
branch: master
commit 42c99697b685a908abb587d2b73878df25e9c34f
Author: Simen Heggestøyl <address@hidden>
Commit: Stefan Monnier <address@hidden>
Fixes: debbugs:19815
* lisp/textmodes/css-mode.el (css-smie-rules): Fix paren indent.
---
lisp/ChangeLog | 4 ++++
lisp/textmodes/css-mode.el | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e86d62d..12d4c94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-09 Simen Heggestøyl <address@hidden> (tiny change)
+
+ * textmodes/css-mode.el (css-smie-rules): Fix paren indent (bug#19815).
+
2015-02-09 Stefan Monnier <address@hidden>
* emacs-lisp/cl-generic.el (cl--generic-lambda): Use
macroexp-parse-body.
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index f6a3ca6..44dc4df 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -331,8 +331,8 @@
(`(:elem . basic) css-indent-offset)
(`(:elem . arg) 0)
(`(:list-intro . ,(or `";" `"")) t) ;"" stands for BOB (bug#15467).
- (`(:before . "{") (if (smie-rule-hanging-p)
- (smie-rule-parent 0)))))
+ (`(:before . ,(or "{" "("))
+ (if (smie-rule-hanging-p) (smie-rule-parent 0)))))
;;;###autoload
(define-derived-mode css-mode fundamental-mode "CSS"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 42c9969: Fixes: debbugs:19815,
Stefan Monnier <=