Changeset 41 for lang/elisp/twittering-mode/branches/tsuyoshi/twittering-mode.el

Timestamp:

05/02/08 13:45:14 (17 years ago)

Author:

tsuyoshi

Message:

apply all patches

Files:

• lang/elisp/twittering-mode/branches/tsuyoshi/twittering-mode.el (modified) (5 diffs)

lang/elisp/twittering-mode/branches/tsuyoshi/twittering-mode.el

@@ -502 +502 @@
                    time-string url)
                (setq time-string
-                (cond ((< secs 5) "less than 5 seconds ago")
-                      ((< secs 10) "less than 10 seconds ago")
-                      ((< secs 20) "less than 20 seconds ago")
-                      ((< secs 30) "half a minute ago")
-                      ((< secs 60) "less than a minute ago")
-                      ((< secs 150) "1 minute ago")
-                      ((< secs 2400) (format "%d minutes ago"
-                                             (/ (+ secs 30) 60)))
-                      ((< secs 5400) "about 1 hour ago")
-                      ((< secs 84600) (format "about %d hours ago"
-                                              (/ (+ secs 1800) 3600)))
-                      (t (format-time-string "%I:%M %p %B %d, %Y" created-at))))
+                     (cond ((< secs 5) "less than 5 seconds ago")
+                           ((< secs 10) "less than 10 seconds ago")
+                           ((< secs 20) "less than 20 seconds ago")
+                           ((< secs 30) "half a minute ago")
+                           ((< secs 60) "less than a minute ago")
+                           ((< secs 150) "1 minute ago")
+                           ((< secs 2400) (format "%d minutes ago"
+                                                  (/ (+ secs 30) 60)))
+                           ((< secs 5400) "about 1 hour ago")
+                           ((< secs 84600) (format "about %d hours ago"
+                                                   (/ (+ secs 1800) 3600)))
+                           (t (format-time-string "%I:%M %p %B %d, %Y" created-at))))
                (setq url (twittering-get-status-url (attr 'user-screen-name) (attr 'id)))
                ;; make status url clickable
@@ -539 +539 @@
         )
       (list-push (substring format-str cursor) result)
-      (apply 'concat (nreverse result))
+      (let ((formatted-status (apply 'concat (nreverse result))))
+        (add-text-properties 0 (length formatted-status)
+                             `(username ,(attr 'user-screen-name))
+                             formatted-status)
+        formatted-status)
       )))
 
@@ -705 +709 @@
 
       ;; make username clickable
-      (add-text-properties 0 (length user-screen-name)
-                           `(mouse-face highlight
-                                        uri ,(concat "http://twitter.com/" user-screen-name)
-                                        username ,user-screen-name
-                                        face twittering-username-face)
-                           user-screen-name)
+      (add-text-properties
+       0 (length user-name)
+       `(mouse-face highlight
+                    uri ,(concat "http://twitter.com/" user-screen-name)
+                    face twittering-username-face)
+       user-name)
+
+      ;; make screen-name clickable
+      (add-text-properties
+       0 (length user-screen-name)
+       `(mouse-face highlight
+                    face twittering-username-face
+                    uri ,(concat "http://twitter.com/" user-screen-name)
+                    face twittering-username-face)
+       user-screen-name)
 
       ;; make URI clickable
@@ -732 +745 @@
                    highlight
                    face twittering-uri-face
-                   username ,screen-name
                    uri ,(concat "http://twitter.com/" screen-name))
                `(mouse-face highlight
@@ -740 +752 @@
           (setq regex-index (match-end 0)) ))
 
-      ;; make screen-name clickable
-      (add-text-properties
-       0 (length user-screen-name)
-       `(mouse-face highlight
-                    face twittering-username-face
-                    uri ,(concat "http://twitter.com/" user-screen-name)
-                    username ,user-screen-name)
-       user-screen-name)
 
       ;; make source pretty and clickable