[Emacs-diffs] trunk r114525: * lisp/textmodes/css-mode.el (css-smie-rules): Toplevel's a list.

[Stefan Monnier]

------------------------------------------------------------
revno: 114525
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15467
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-04 17:45:37 -0400
message:
  * lisp/textmodes/css-mode.el (css-smie-rules): Toplevel's a list.
  * test/automated/completion-tests.el:
  * test/indent/css-mode.css: New files.
added:
  test/automated/completion-tests.el 
completiontests.el-20131004022043-eebmez8znrlgeit9-1
  test/indent/css-mode.css       cssmode.css-20131004214415-leh4zls88xu60yhv-1
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/textmodes/css-mode.el     cssmode.el-20091113204419-o5vbwnq5f7feedwu-5050
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-04 19:06:45 +0000
+++ b/lisp/ChangeLog    2013-10-04 21:45:37 +0000
@@ -1,5 +1,9 @@
 2013-10-04  Stefan Monnier  <address@hidden>
 
+       * textmodes/css-mode.el (css-smie-rules): Toplevel's a list (bug#15467).
+
+2013-10-04  Stefan Monnier  <address@hidden>
+
        * 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

=== modified file 'lisp/textmodes/css-mode.el'
--- a/lisp/textmodes/css-mode.el        2013-08-29 21:00:18 +0000
+++ b/lisp/textmodes/css-mode.el        2013-10-04 21:45:37 +0000
@@ -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)))))
 

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-10-03 07:11:27 +0000
+++ b/test/ChangeLog    2013-10-04 21:45:37 +0000
@@ -1,3 +1,8 @@
+2013-10-04  Stefan Monnier  <address@hidden>
+
+       * automated/completion-tests.el:
+       * indent/css-mode.css: New files.
+
 2013-10-03  Daiki Ueno  <address@hidden>
 
        * automated/data/package/signed/archive-contents:

=== added file 'test/automated/completion-tests.el'
--- a/test/automated/completion-tests.el        1970-01-01 00:00:00 +0000
+++ b/test/automated/completion-tests.el        2013-10-04 21:45:37 +0000
@@ -0,0 +1,46 @@
+;;; completion-tests.el --- Tests for completion functions  -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2013  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier <address@hidden>
+;; 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

=== added file 'test/indent/css-mode.css'
--- a/test/indent/css-mode.css  1970-01-01 00:00:00 +0000
+++ b/test/indent/css-mode.css  2013-10-04 21:45:37 +0000
@@ -0,0 +1,3 @@
+.xxx
+{
+}