* lisp/textmodes/css-mode.el (css-smie-rules): Toplevel's a list.

* test/automated/completion-tests.el:
* test/indent/css-mode.css: New files.

Fixes: debbugs:15467

5 files changed, 59 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 253f90278cd..2f996cba224 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * textmodes/css-mode.el (css-smie-rules): Toplevel's a list (bug#15467).
+
+2013-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * subr.el (read-passwd): Hide chars even when called within a context
         where after-change-functions is disabled (bug#15501).
         (set-temporary-overlay-map): Don't remove oneself from pre-command-hook
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 9c32604b4f4..0f4daa9a35c 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -302,6 +302,7 @@
   (pcase (cons kind token)
     (`(:elem . basic) css-indent-offset)
     (`(:elem . arg) 0)
+    (`(:list-intro . "") t)             ;"" stands for BOB (bug#15467).
     (`(:before . "{") (if (smie-rule-hanging-p)
                          (smie-rule-parent 0)))))
 
diff --git a/test/ChangeLog b/test/ChangeLog
index 00a49eea936..b3bcdd9a5bd 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/completion-tests.el:
+        * indent/css-mode.css: New files.
+
 2013-10-03  Daiki Ueno  <ueno@gnu.org>
 
         * automated/data/package/signed/archive-contents:
diff --git a/test/automated/completion-tests.el b/test/automated/completion-tests.el
new file mode 100644
index 00000000000..9e54a00ddaf
--- /dev/null
+++ b/test/automated/completion-tests.el
@@ -0,0 +1,46 @@
+;;; completion-tests.el --- Tests for completion functions  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2013  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+
+(ert-deftest completion-test1 ()
+  (with-temp-buffer
+    (cl-flet* ((test/completion-table (string pred action)
+                                      (if (eq action 'lambda)
+                                          nil
+                                        "test: "))
+               (test/completion-at-point ()
+                                         (list (copy-marker (point-min))
+                                               (copy-marker (point))
+                                               #'test/completion-table)))
+      (let ((completion-at-point-functions (list #'test/completion-at-point)))
+        (insert "TEST")
+        (completion-at-point)
+        (should (equal (buffer-string)
+                       "test: "))))))
+
+(provide 'completion-tests)
+;;; completion-tests.el ends here
diff --git a/test/indent/css-mode.css b/test/indent/css-mode.css
new file mode 100644
index 00000000000..f3787538460
--- /dev/null
+++ b/test/indent/css-mode.css
@@ -0,0 +1,3 @@
+.xxx
+{
+}