diff options
| author | Bill Wohler <wohler@newt.com> | 2006-04-18 01:55:54 +0000 |
|---|---|---|
| committer | Bill Wohler <wohler@newt.com> | 2006-04-18 01:55:54 +0000 |
| commit | d5468dff8757b2ad06d1b6ae72b18445f337d017 (patch) | |
| tree | 1cecba6e0fe990294682ae95c9cede192bcc9e65 /lisp | |
| parent | c90c4cf168b968b144796515355e4cd2e898b613 (diff) | |
| download | emacs-d5468dff8757b2ad06d1b6ae72b18445f337d017.tar.gz | |
(mh-insert-x-mailer): Strip build number from version in X-Mailer
field (closes SF #1466481).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mh-e/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mh-e/mh-comp.el | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index c56f68b73be..f6fe4ce8993 100644 --- 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 b3c6ba12f57..ad80e3be838 100644 --- 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)) |