Merge branch 'master' into network-list

Conflicts:
	sx-filter.el
	sx-question.el

1 files changed, 22 insertions, 0 deletions

diff --git a/sx-time.el b/sx-time.el
index 1c8e353..9c4dfaa 100644
--- a/sx-time.el
+++ b/sx-time.el
@@ -49,5 +49,27 @@
          (concat (format "%.0f" (/ delay (car (cddr here))))
                  (cadr here)))))))
 
+(defcustom sx-time-date-format-year "%H:%M %e %b %Y"
+  "Format used for dates on a past year.
+See also `sx-time-date-format'."
+  :type 'string
+  :group 'sx-time)
+
+(defcustom sx-time-date-format "%H:%M - %d %b"
+  "Format used for dates on this year.
+See also `sx-time-date-format-year'."
+  :type 'string
+  :group 'sx-time)
+
+(defun sx-time-seconds-to-date (seconds)
+  "Return the integer SECONDS as a date string."
+  (let ((time (seconds-to-time seconds)))
+    (format-time-string
+     (if (string= (format-time-string "%Y")
+                  (format-time-string "%Y" time))
+         sx-time-date-format
+       sx-time-date-format-year)
+     time)))
+
 (provide 'sx-time)
 ;;; sx-time.el ends here