[Emacs-commit] emacs/lisp/mh-e mh-comp.el ChangeLog

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/04/18 01:55:54

Modified files:
        lisp/mh-e      : mh-comp.el ChangeLog 

Log message:
        (mh-insert-x-mailer): Strip build number from version in X-Mailer
        field (closes SF #1466481).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-comp.el.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.204&tr2=1.205&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.204 emacs/lisp/mh-e/ChangeLog:1.205
--- emacs/lisp/mh-e/ChangeLog:1.204     Tue Apr 18 00:55:43 2006
+++ emacs/lisp/mh-e/ChangeLog   Tue Apr 18 01:55:54 2006
@@ -1,5 +1,8 @@
 2006-04-17  Bill Wohler  <address@hidden>
 
+       * 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*
Index: emacs/lisp/mh-e/mh-comp.el
diff -u emacs/lisp/mh-e/mh-comp.el:1.52 emacs/lisp/mh-e/mh-comp.el:1.53
--- emacs/lisp/mh-e/mh-comp.el:1.52     Sat Apr 15 00:28:08 2006
+++ emacs/lisp/mh-e/mh-comp.el  Tue Apr 18 01:55:54 2006
@@ -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))