Merge branch 'images' into print-question-without-temp-buffer

1 files changed, 7 insertions, 8 deletions

diff --git a/sx.el b/sx.el
index e0609a7..33b36b6 100644
--- a/sx.el
+++ b/sx.el
@@ -4,7 +4,7 @@
 
 ;; Author: Sean Allred <code@seanallred.com>
 ;; URL: https://github.com/vermiculus/sx.el/
-;; Version: 0.1
+;; Version: 0.2
 ;; Keywords: help, hypermedia, tools
 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5") (json "1.3") (markdown-mode "2.0") (let-alist "1.0.3"))
 
@@ -28,7 +28,7 @@
 ;;; Code:
 (require 'tabulated-list)
 
-(defconst sx-version "0.1" "Version of the `sx' package.")
+(defconst sx-version "0.2" "Version of the `sx' package.")
 
 (defgroup sx nil
   "Customization group for the `sx' package."
@@ -148,12 +148,7 @@ with a `link' property)."
              ;; From URL
              (string-match (rx "/questions/"
                                ;; Question ID
-                               (group-n 1 (+ digit)) "/"
-                               ;; Optional question title
-                               (optional (+ (not (any "/"))) "/")
-                               ;; Garbage at the end
-                               (optional (and (any "?#") (* any)))
-                               string-end)
+                               (group-n 1 (+ digit)) "/")
                            link))
             (push '(type . question) result)))
       (push (cons 'id (string-to-number (match-string-no-properties 1 link)))
@@ -336,6 +331,10 @@ GET-FUNC and performs the actual comparison."
               (funcall ,get-func a)
               (funcall ,get-func b))))
 
+(defun sx--squash-whitespace (string)
+  "Return STRING with consecutive whitespace squashed together."
+  (replace-regexp-in-string "[ 	\r\n]+" " " string))
+
 
 ;;; Printing request data
 (defvar sx--overlays nil