diff options
author | Artur Malabarba <bruce.connor.am@gmail.com> | 2014-12-25 12:47:28 -0200 |
---|---|---|
committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2014-12-25 12:47:28 -0200 |
commit | 5225bd4ae6e26177a4daf62ddc5e807784e7c46e (patch) | |
tree | 98494ca03f8902e78ebbab0bd023237401a3beca | |
parent | b1149c3410e8aa4816af4cc7c9ebd5e14cb91043 (diff) |
Fix merge
-rw-r--r-- | sx.el | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -69,9 +69,12 @@ DATA can also be the link itself." DATA can be a question, answer, comment, or user (or any object with a `link' property)." (when data - (unless (assq 'site data) - (setcdr data (cons (cons 'site (sx--site data)) - (cdr data)))) + (let-alist data + (unless .site_par + (setcdr data (cons (cons 'site_par + (or .site.api_site_parameter + (sx--site data))) + (cdr data))))) data)) (defmacro sx-assoc-let (alist &rest body) |