Merge pull request #98 from Wilfred/preserve_text_properties

Preserve text properties.

3 files changed, 8 insertions, 6 deletions

diff --git a/dev/examples-to-tests.el b/dev/examples-to-tests.el
index bbed66b..57db6cc 100644
--- a/dev/examples-to-tests.el
+++ b/dev/examples-to-tests.el
@@ -3,7 +3,7 @@
 (defun examples-to-should-1 (examples)
   (let ((actual (car examples))
         (expected (cadr (cdr examples))))
-    `(should (equal ,actual ,expected))))
+    `(should (equal-including-properties ,actual ,expected))))
 
 (defun examples-to-should (examples)
   (let (result)
diff --git a/dev/examples.el b/dev/examples.el
index 0cd1f40..b295ec7 100644
--- a/dev/examples.el
+++ b/dev/examples.el
@@ -32,7 +32,8 @@
   (defexamples s-word-wrap
     (s-word-wrap 10 "This is too long") => "This is\ntoo long"
     (s-word-wrap 10 "This is way way too long") => "This is\nway way\ntoo long"
-    (s-word-wrap 10 "It-wraps-words-but-does-not-break-them") => "It-wraps-words-but-does-not-break-them")
+    (s-word-wrap 10 "It-wraps-words-but-does-not-break-them") => "It-wraps-words-but-does-not-break-them"
+    (s-word-wrap 100 (propertize "foo bar" 'face 'font-lock-keyword-face)) => (propertize "foo bar" 'face 'font-lock-keyword-face))
 
   (defexamples s-center
     (s-center 5 "a") => "  a  "
@@ -171,7 +172,8 @@
     (s-split-up-to "|" "foo||bar|baz|qux" 10 t) => '("foo" "bar" "baz" "qux")
     (s-split-up-to "|" "foo|bar|baz|" 2) => '("foo" "bar" "baz|")
     (s-split-up-to "|" "foo|bar|baz|" 2 t) => '("foo" "bar" "baz|")
-    (s-split-up-to "|" "foo|bar|baz|qux|" 2) => '("foo" "bar" "baz|qux|"))
+    (s-split-up-to "|" "foo|bar|baz|qux|" 2) => '("foo" "bar" "baz|qux|")
+    (s-split-up-to "|" (propertize "foo" 'face 'font-lock-keyword-face) 1) => (list (propertize "foo" 'face 'font-lock-keyword-face)))
 
   (defexamples s-join
     (s-join "+" '("abc" "def" "ghi")) => "abc+def+ghi"
diff --git a/s.el b/s.el
index 7cb00f0..efd9a54 100644
--- a/s.el
+++ b/s.el
@@ -70,13 +70,13 @@ See also `s-split'."
         (setq op (goto-char (point-min)))
         (while (and (re-search-forward separator nil t)
                     (< 0 n))
-          (let ((sub (buffer-substring-no-properties op (match-beginning 0))))
+          (let ((sub (buffer-substring op (match-beginning 0))))
             (unless (and omit-nulls
                          (equal sub ""))
               (push sub r)))
           (setq op (goto-char (match-end 0)))
           (setq n (1- n)))
-        (let ((sub (buffer-substring-no-properties op (point-max))))
+        (let ((sub (buffer-substring op (point-max))))
           (unless (and omit-nulls
                        (equal sub ""))
             (push sub r))))
@@ -184,7 +184,7 @@ See also `s-split'."
     (insert s)
     (let ((fill-column len))
       (fill-region (point-min) (point-max)))
-    (buffer-substring-no-properties (point-min) (point-max))))
+    (buffer-substring (point-min) (point-max))))
 
 (defun s-center (len s)
   "If S is shorter than LEN, pad it with spaces so it is centered."