Fix for bug 284 (control of message-id display).

src/ChangeLog

+2004-10-23  Pontus Freyhult  <pont@soua.net>
+
+	Fix bug 284:
+	* english-strings.el, swedish-strings.el: 
+	(lyskom-custom-strings): Added kom-show-imported-message-id-tag
+	and kom-show-imported-message-id-doc.
+	(lyskom-message): Added message-id.
+
+	* option-edit.el (lyskom-customize-buffer-format): Added 
+	kom-show-imported-message-id.
+	(lyskom-custom-variables): Dito.	
+
+	*vars.el.in (kom-show-imported-message-id): New variable.
+	(kom-show-imported-external-recipients): Changed documentation
+	(added kom-show-imported-message-id as "see also").
+
+	* view-text.el (lyskom-view-text): Show Message-Id if available
+	and kom-show-imported-message-id is true.
+	
 2004-10-19  Pontus Freyhult  <pont@soua.net>
 
 	Allow for easy relogin from dead sessions (bug 1278):

src/english-strings.el

@@ -1018,6 +1018,7 @@ Help: \\[describe-mode] ---")
     
     (envelope-sender . "Sent by: %#1s\n")
     (attachment-filename . "Attachment file name: \"%#1s\"\n")
+    (message-id . "Message-ID: %#1s\n")
 
     (comment-to-text-by . "Comment to text %#1n by %#2P")
     (footnote-to-text-by . "Footnote to text %#1n by %#2P")
@@ -3897,6 +3898,10 @@ up menus.")
   Show external recipients and CC recipients of imported e-mails if this
   is on. This only works with compilant e-mail importers.")
 
+    (kom-show-imported-message-id-doc . "\
+  Show Message-Id of imported e-mails if this is on. This only works with 
+  compilant e-mail importers.")
+
     (kom-agree-text-doc . "\
   Default text for the Agree command. It can either be a text or a list
   of texts. If it is a list, one of the texts will be chosen at random.")
@@ -4395,6 +4400,7 @@ up menus.")
     (kom-show-imported-importer-tag . "Show importer of imported messages:")
     (kom-show-imported-envelope-sender-tag . "Show sender of imported messages:")
     (kom-show-imported-external-recipients-tag . "Show external recipients of imported messages:")
+    (kom-show-imported-message-id-tag . "Show message-id of imported messages:")
     (kom-agree-text-tag . "Default text for Agree:")
     (kom-silent-ansaphone-tag . "Beep when auto reply is on:")
     (kom-default-session-priority-tag . "Default session priority:")

src/option-edit.el

@@ -217,6 +217,7 @@
     [kom-show-imported-importer]
     [kom-show-imported-external-recipients]
     [kom-show-imported-envelope-sender]
+    [kom-show-imported-message-id]
     [kom-text-properties]
     [kom-fontify-text]
     [kom-smileys]
@@ -809,6 +810,7 @@ All key bindings:
     (kom-show-imported-importer (toggle (on off)))
     (kom-show-imported-envelope-sender (toggle (on off)))
     (kom-show-imported-external-recipients (toggle (on off)))
+    (kom-show-imported-message-id (toggle (on off)))
     (kom-agree-text (choice ((string nil :tag a-string)
                              (repeat (string nil
                                              :tag a-string

src/swedish-strings.el

@@ -1053,6 +1053,7 @@ Annat se \\[describe-mode] ---")
     
     (envelope-sender . "Snt av: %#1s\n")
     (attachment-filename . "Bilagans filnamn: \"%#1s\"\n")
+    (message-id . "Meddelande-ID: %#1s\n")
 
     (written-by . " av %#1P\n")
 
@@ -4010,6 +4011,9 @@ ta fram menyer.")
     (kom-show-imported-external-recipients-doc . "\
   Visa externa mottagare och extra-kopiemottagare om detta r pslaget.")
 
+    (kom-show-imported-message-id-doc . "\
+  Pslaget betyder visa meddelande-id.")
+
     (kom-agree-text-doc . "\
   Text som anvnds av kommandot Hlla med. Det kan antingen vara en text
   eller en lista av texter. Om det r en lista s vljs ett alternativ
@@ -4508,6 +4512,7 @@ ta fram menyer.")
     (kom-show-imported-importer-tag . "Visa importr av importerade inlgg:")
     (kom-show-imported-envelope-sender-tag . "Visa avsndare av importerade inlgg:")
     (kom-show-imported-external-recipients-tag . "Visa externa mottagare till importerade inlgg:")
+    (kom-show-imported-message-id-tag . "Visa meddelande-id fr importerade inlgg:")
     (kom-agree-text-tag . "Text fr Hlla med:")
     (kom-silent-ansaphone-tag . "Pip nr automatsvar r pslaget:")
     (kom-default-session-priority-tag . "Lsniv fr nya sessioner:")

src/vars.el.in

@@ -3161,6 +3161,30 @@ Other variables that control display of imported e-mail include
 `kom-show-imported-importer' and
 `kom-show-imported-external-recipients'.
 
+Values other than `t' and `nil' are reserved for future use."
+  server)
+
+(def-kom-var kom-show-imported-message-id nil
+  "**Controls display of the message id in imported mail.
+
+When set to `t', display the message id of the imported e-mail. When
+set to `nil', don't.
+
+`kom-show-imported-message-id' set to `t':
+
+  2912231 today 10:07 +0100 /41 lines/  Super-User <root@spareribs.meat.com>
+  Message-ID: <D1696C471C6CD511A0BE00D0B7A932DE01BBB4FA@spareribs.meat.com>
+  External recipient: BBQ <531@kom.meat.com>
+
+`kom-show-imported-message-id' set to `nil':
+
+  2912231 today 10:07 +0100 /41 lines/  Super-User <root@spareribs.meat.com>
+  External recipient: BBQ <531@kom.meat.com>
+
+Other variables that control display of imported e-mail include
+`kom-show-imported-envelope-sender', `kom-show-imported-importer' and
+`kom-show-imported-external-recipients'.
+
 Values other than `t' and `nil' are reserved for future use."
   server)
 
@@ -3184,8 +3208,8 @@ headers.
   Imported: today 00:07 by Mailman
 
 Other variables that control display of imported e-mail include
-`kom-show-imported-importer' and
-`kom-show-imported-external-recipients'.
+`kom-show-imported-envelope-sender', `kom-show-imported-importer' and
+`kom-show-imported-message-id'.
 
 Values other than `t' and `nil' are reserved for future use."
   server)

src/view-text.el

@@ -113,6 +113,7 @@ Note that this function must not be called asynchronously."
                          (mx-author (car (lyskom-get-aux-item (text-stat->aux-items text-stat) 16)))
                          (mx-to (lyskom-get-aux-item (text-stat->aux-items text-stat) 19))
                          (mx-cc (lyskom-get-aux-item (text-stat->aux-items text-stat) 20))
+			 (mx-message-id (lyskom-get-aux-item (text-stat->aux-items text-stat) 22))
                          (mx-filename (lyskom-get-aux-item (text-stat->aux-items text-stat) 10104))
                          (mx-sender (lyskom-get-aux-item (text-stat->aux-items text-stat) 10103))
 			 (mx-headers (lyskom-get-aux-item (text-stat->aux-items text-stat) 24))
@@ -154,6 +155,9 @@ Note that this function must not be called asynchronously."
                    (when mx-filename
                      (lyskom-format-insert 'attachment-filename
                                            (aux-item->data (car mx-filename))))
+                   (when (and mx-message-id kom-show-imported-message-id)
+                     (lyskom-format-insert 'message-id
+                                           (aux-item->data (car mx-message-id))))
 
                    ;; Insert imported at