Merge pull request #217 from vermiculus/really-fix-filling

Really fix filling

2 files changed, 60 insertions, 2 deletions

diff --git a/sx-question-print.el b/sx-question-print.el
index e2db76f..1e25d67 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -462,9 +462,11 @@ font-locking."
 
 (defun sx-question-mode--skip-references ()
   "If there's a reference ahead, skip it and return non-nil."
-  (while (looking-at-p (format sx-question-mode--reference-regexp ".+"))
+  (forward-line 0)
+  (when (looking-at-p (format sx-question-mode--reference-regexp ".+"))
     ;; Returns non-nil
-    (forward-line 1)))
+    (forward-paragraph 1)
+    t))
 
 (provide 'sx-question-print)
 ;;; sx-question-print.el ends here
diff --git a/test/test-printing.el b/test/test-printing.el
index 2857cb7..c477b28 100644
--- a/test/test-printing.el
+++ b/test/test-printing.el
@@ -71,3 +71,59 @@ after being run through `sx-question--tag-format'."
     (sx--user-@name '((display_name . "ĤÞßĐŁŘĞĜÝŸÑŃŚŞŠŜŻŹŽÇĆČĈÙÚÛÜŬŮÒÓÔÕÖØŐÐÌÍÎÏıÈÉÊËĘÀÅÁÂÄÃÅĄĴ")))
     "@HTHssDLRGGYYNNSSSSZZZCCCCUUUUUUOOOOOOOOIIIIiEEEEEAAAAAAAAJ")))
 
+(ert-deftest sx-question-mode--fill-and-fontify ()
+  "Check complicated questions are filled correctly."
+  (should
+   (equal
+    (sx-question-mode--fill-and-fontify
+     "Creating an account on a new site requires you to log into that site using *the same credentials you used on existing sites.* For instance, if you used the Stack Exchange login method, you'd...
+
+1. Click the \"Log in using Stack Exchange\" button:
+
+  ![][1]
+
+2. Enter your username and password (yes, even if you *just did this* to log into, say, Stack Overflow) and press the \"Log In\" button:
+
+  ![][2]
+
+3. Confirm the creation of the new account:
+
+  ![][3]
+
+        some code block
+        some code block
+        some code block
+        some code block
+        some code block
+        some code block
+
+  [1]: http://i.stack.imgur.com/ktFTs.png
+  [2]: http://i.stack.imgur.com/5l2AY.png
+  [3]: http://i.stack.imgur.com/22myl.png")
+    "Creating an account on a new site requires you to log into that site
+using *the same credentials you used on existing sites.* For instance,
+if you used the Stack Exchange login method, you'd...
+
+1. Click the \"Log in using Stack Exchange\" button:
+
+  ![][1]
+
+2. Enter your username and password (yes, even if you *just did this*
+   to log into, say, Stack Overflow) and press the \"Log In\" button:
+
+  ![][2]
+
+3. Confirm the creation of the new account:
+
+  ![][3]
+
+        some code block
+        some code block
+        some code block
+        some code block
+        some code block
+        some code block
+        
+  [1]: http://i.stack.imgur.com/ktFTs.png
+  [2]: http://i.stack.imgur.com/5l2AY.png
+  [3]: http://i.stack.imgur.com/22myl.png")))