aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmihica <smihica@gmail.com>2013-04-06 00:16:38 +0900
committersmihica <smihica@gmail.com>2013-04-06 00:17:05 +0900
commit3d4c9de975da913fefd2d6f4e5f276ea9e03ed26 (patch)
tree6d533516c1e94313421ba917ccde000b4ffb379d
parenta6a5f57bdfa6bcbaa64c5e7088c2882255a5f627 (diff)
downloademmet-mode-3d4c9de975da913fefd2d6f4e5f276ea9e03ed26.tar.lz
emmet-mode-3d4c9de975da913fefd2d6f4e5f276ea9e03ed26.tar.xz
emmet-mode-3d4c9de975da913fefd2d6f4e5f276ea9e03ed26.zip
Supported a missing pattern like 'prop:${default}'.
-rw-r--r--src/css-abbrev.el2
-rw-r--r--src/test.el3
-rw-r--r--zencoding-mode.el2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/css-abbrev.el b/src/css-abbrev.el
index 72021ad..7deb427 100644
--- a/src/css-abbrev.el
+++ b/src/css-abbrev.el
@@ -106,7 +106,7 @@
(let ((rt '(concat)) (idx-max 0))
(loop for i from 0 to 255 do
(zencoding-aif
- (string-match "\\(?:|\\|${\\([0-9]\\)\\(?::\\(.+?\\)\\|\\)}\\)" str)
+ (string-match "\\(?:|\\|${\\(?:\\([0-9]\\):\\|\\)\\(?:\\(.+?\\)\\|\\)}\\)" str)
(destructuring-bind (mat idx def)
(mapcar (lambda (ref) (match-string ref str)) '(0 1 2))
(setf rt
diff --git a/src/test.el b/src/test.el
index f7b7889..3dae692 100644
--- a/src/test.el
+++ b/src/test.el
@@ -474,7 +474,8 @@
"padding:0px 1% 2em 3ex;")
"p!+m10e!+f" ("padding: !important;"
"margin:10em !important;"
- "font:;"))
+ "font:;")
+ "fs" ("font-style:italic;"))
;; start
(zencoding-test-cases) \ No newline at end of file
diff --git a/zencoding-mode.el b/zencoding-mode.el
index 4016218..6625032 100644
--- a/zencoding-mode.el
+++ b/zencoding-mode.el
@@ -1647,7 +1647,7 @@ tbl))
(let ((rt '(concat)) (idx-max 0))
(loop for i from 0 to 255 do
(zencoding-aif
- (string-match "\\(?:|\\|${\\([0-9]\\)\\(?::\\(.+?\\)\\|\\)}\\)" str)
+ (string-match "\\(?:|\\|${\\(?:\\([0-9]\\):\\|\\)\\(?:\\(.+?\\)\\|\\)}\\)" str)
(destructuring-bind (mat idx def)
(mapcar (lambda (ref) (match-string ref str)) '(0 1 2))
(setf rt