[gnus git] branch master updated: m0-7-18-g8e3b3fa =3= message.el (message-insert-formatted-citation-line): handle finding first/lastname when more than 2 names appear. ; gnus.texi: Fix missing backslash on \\&. ; Show title attribute of span elements as mouse over text.
Adam Sj??gren <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 8e3b3fa6d8b9a97c183d9f7ae79657fe11c5af29 (commit)
via 8604c8dba00059ece9c624149113eeaf60424071 (commit)
via 413816a18bfc116cd6e54cea85f880220a978945 (commit)
from 786ff2141fd1613c88035aae899ec9d71ffb5cd0 (commit)
- Log -----------------------------------------------------------------
commit 8e3b3fa6d8b9a97c183d9f7ae79657fe11c5af29
Author: Adam Sjøgren <[email protected]>
Date: Fri May 17 00:00:02 2013 +0200
message.el (message-insert-formatted-citation-line): handle finding first/lastname when more than 2 names appear.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9506db7..9efb9fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2013-05-19 Adam Sjøgren <[email protected]>
+ * message.el (message-insert-formatted-citation-line): handle finding
+ first/lastname when more than 2 names appear.
+
+2013-05-19 Adam Sjøgren <[email protected]>
+
* shr.el (shr-tag-span): New function.
2013-05-18 Glenn Morris <[email protected]>
diff --git a/lisp/message.el b/lisp/message.el
index 920e805..2374314 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3988,18 +3988,16 @@ See `message-citation-line-format'."
(let ((i ?A) lst)
(when (stringp name)
;; Guess first name and last name:
- (cond ((string-match
- "\\`\\(\\w\\|[-.]\\)+ \\(\\w\\|[-.]\\)+\\'" name)
- (setq fname (nth 0 (split-string name "[ \t]+"))
- lname (nth 1 (split-string name "[ \t]+"))))
- ((string-match
- "\\`\\(\\w\\|[-.]\\)+, \\(\\w\\|[-.]\\)+\\'" name)
- (setq fname (nth 1 (split-string name "[ \t,]+"))
- lname (nth 0 (split-string name "[ \t,]+"))))
- ((string-match
- "\\`\\(\\w\\|[-.]\\)+\\'" name)
- (setq fname name
- lname ""))))
+ (let* ((names (delq nil (mapcar (lambda (x)
+ (if (string-match "\\`\\(\\w\\|[-.]\\)+\\'" x) x nil))
+ (split-string name "[ \t]+"))))
+ (count (length names)))
+ (cond ((= count 1) (setq fname (car names)
+ lname ""))
+ ((or (= count 2) (= count 3)) (setq fname (car names)
+ lname (mapconcat 'identity (cdr names) " ")))
+ ((> count 3) (setq fname (mapconcat 'identity (butlast names (- count 2)) " ")
+ lname (mapconcat 'identity (nthcdr 2 names) " "))) )))
;; The following letters are not used in `format-time-string':
(push ?E lst) (push "<E>" lst)
(push ?F lst) (push fname lst)
commit 8604c8dba00059ece9c624149113eeaf60424071
Author: Adam Sjøgren <[email protected]>
Date: Tue Sep 20 20:56:45 2011 +0200
gnus.texi: Fix missing backslash on \\&.
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 443cb5b..59723f9 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-19 Adam Sjøgren <[email protected]>
+
+ * gnus.texi (Fancy Mail Splitting): Fix typo.
+
2013-03-17 Paul Eggert <[email protected]>
doc: convert some TeX accents to UTF-8
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 52eb209..ad80430 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -15401,7 +15401,7 @@ substitutions in the group names), you can say things like:
In this example, messages sent to @samp{debian-foo@@lists.debian.org}
will be filed in @samp{mail.debian.foo}.
-If the string contains the element @samp{\&}, then the previously
+If the string contains the element @samp{\\&}, then the previously
matched string will be substituted. Similarly, the elements @samp{\\1}
up to @samp{\\9} will be substituted with the text matched by the
groupings 1 through 9.
commit 413816a18bfc116cd6e54cea85f880220a978945
Author: Adam Sjøgren <[email protected]>
Date: Sun Mar 27 10:29:08 2011 +0200
Show title attribute of span elements as mouse over text.
* shr.el (shr-tag-span): New function.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92bc307..9506db7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-19 Adam Sjøgren <[email protected]>
+
+ * shr.el (shr-tag-span): New function.
+
2013-05-18 Glenn Morris <[email protected]>
* message.el (message-mode): Use message-mode-abbrev-table,
diff --git a/lisp/shr.el b/lisp/shr.el
index 5c1b99e..2d2272d 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -1088,6 +1088,14 @@ ones, in case fg and bg are nil."
(shr-indent))
(shr-generic cont))
+(defun shr-tag-span (cont)
+ (let ((title (cdr (assq :title cont))))
+ (shr-generic cont)
+ (when title
+ (when shr-start
+ (let ((overlay (shr-make-overlay shr-start (point))))
+ (overlay-put overlay 'help-echo title))))))
+
(defun shr-tag-h1 (cont)
(shr-heading cont 'bold 'underline))
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 9 +++++++++
lisp/message.el | 22 ++++++++++------------
lisp/shr.el | 8 ++++++++
texi/ChangeLog | 4 ++++
texi/gnus.texi | 2 +-
5 files changed, 32 insertions(+), 13 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project