diff lisp/build-report.el @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents eb82fbb675ea
children 308d34e9f07d
line wrap: on
line diff
--- a/lisp/build-report.el	Sat Dec 26 00:20:27 2009 -0600
+++ b/lisp/build-report.el	Sat Dec 26 21:18:49 2009 -0600
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1997-2003 Adrian Aichner
 
 ;; Author: Adrian Aichner <adrian@xemacs.org>
-;; Date: $Date: 2005/10/21 10:34:35 $
-;; Version: $Revision: 1.14 $
+;; Date: $Date: 2007/06/21 13:39:10 $
+;; Version: $Revision: 1.15 $
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
@@ -69,7 +69,7 @@
 emacs_minor_version\\s-*=\\s-*\\([0-9]+\\)
 emacs_beta_version\\s-*=\\s-*\\([0-9]+\\)?
 xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\"\\(
-xemacs_extra_name\\s-*=\\s-*\"\\([^\"]+\\)\"\\)?"
+xemacs_extra_name\\s-*=\\s-*\"?\\([^\"]+\\)\"?\\)?"
   "*REGEXP matching XEmacs Beta Version variable assignments in
 `build-report-version-file' file.  This variable is used by
 `build-report-version-file-data'.")
@@ -520,7 +520,7 @@
   "Concatenate elements of `build-report-delete-regexp' and a general
 MIME tag REGEXP.  The result is a REGEXP string matching either of the
 REGEXPs in `build-report-delete-regexp' or a general MIME tag REGEXP."
-  (mapconcat '(lambda (item) item)
+  (mapconcat #'identity
              build-report-delete-regexp "\\|"))
 
 (defun build-report-installation-data (&optional file)