(mh-insert-x-mailer): Strip build number from version in X-Mailer

field (closes SF #1466481).

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index c56f68b73be3cb4ff4e3c6f2c6070c129378fdda..f6fe4ce8993bea6cd869361116b8e0f1b168ad47 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-17  Bill Wohler  <wohler@newt.com>
 
+       * mh-comp.el (mh-insert-x-mailer): Strip build number from
+       version in X-Mailer field (closes SF #1466481).
+
        * mh-acros.el (mh-defun-compat): Rename to defun-mh in order that
        variables and functions with the same name are found correctly by
        find-func (invoked by clicking on the filename link in the *Help*

diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index b3c6ba12f573fad678a8483460a81d3e154914d6..ad80e3be838e57f6ffcdb0c49c285ee3b05b291b 100644 (file)
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -912,7 +912,10 @@ The versions of MH-E, Emacs, and MH are shown."
           (format "MH-E %s; %s; %sEmacs %s"
                   mh-version mh-variant-in-use
                   (if mh-xemacs-flag "X" "GNU ")
-                  (cond ((not mh-xemacs-flag) emacs-version)
+                  (cond ((not mh-xemacs-flag)
+                         (string-match "[0-9]+\\.[0-9]+\\(\\.[0-9]+\\)?"
+                                       emacs-version)
+                         (match-string 0 emacs-version))
                         ((string-match "[0-9.]*\\( +\([ a-z]+[0-9]+\)\\)?"
                                        emacs-version)
                          (match-string 0 emacs-version))