changeset 70062:e4338fe2e331

(mh-insert-x-mailer): Strip build number from version in X-Mailer field (closes SF #1466481).
author Bill Wohler <wohler@newt.com>
date Tue, 18 Apr 2006 01:55:54 +0000
parents b3ab71ac7f4e
children be502e8c29ea
files lisp/mh-e/ChangeLog lisp/mh-e/mh-comp.el
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog	Tue Apr 18 00:55:43 2006 +0000
+++ b/lisp/mh-e/ChangeLog	Tue Apr 18 01:55:54 2006 +0000
@@ -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*
--- a/lisp/mh-e/mh-comp.el	Tue Apr 18 00:55:43 2006 +0000
+++ b/lisp/mh-e/mh-comp.el	Tue Apr 18 01:55:54 2006 +0000
@@ -912,7 +912,10 @@
           (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))