[Emacs-diffs] master 0f2fd56: lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to fall back to email address if no first name could be determined

[Katsumi Yamaoka]

branch: master
commit 0f2fd5603a06982ef057f0a8bc12e76bc8e026a3
Author: Adam Sjøgren <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to 
fall back to email address if no first name could be determined
---
 lisp/gnus/ChangeLog  |    5 +++++
 lisp/gnus/message.el |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5d699e0..2ee0c56 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-08  Adam Sjøgren  <address@hidden>
+
+       * message.el (message-insert-formatted-citation-line): Change %F to
+       fall back to email address if no first name could be determined.
+
 2015-03-07  Stefan Monnier  <address@hidden>
 
        * registry.el (registry-lookup-breaks-before-lexbind, registry-lookup)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a06de2a..112f0ba 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -989,7 +989,8 @@ are replaced:
   %n   The mail address, e.g. \"address@hidden".
   %N   The real name if present, e.g.: \"John Doe\", else fall
        back to the mail address.
-  %F   The first name if present, e.g.: \"John\".
+  %F   The first name if present, e.g.: \"John\", else fall
+       back to the mail address.
   %L   The last name if present, e.g.: \"Doe\".
   %Z, %z   The time zone in the numeric form, e.g.:\"+0000\".
 
@@ -4039,7 +4040,7 @@ See `message-citation-line-format'."
                       (setq fname lname lname newlname)))))
              ;; The following letters are not used in `format-time-string':
              (push ?E lst) (push "<E>" lst)
-             (push ?F lst) (push fname lst)
+             (push ?F lst) (push (or fname name-or-net) lst)
              ;; We might want to use "" instead of "<X>" later.
              (push ?J lst) (push "<J>" lst)
              (push ?K lst) (push "<K>" lst)