APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1496172625 -3600
# Tue May 30 20:30:25 2017 +0100
# Node ID b803128e420963ce405b3ac51c7f9a80183c496b
# Parent 5465cf0baa425adc8df3c11e14f9c3783c6bc702
Give the correct bounding keywords to #'parse-integer in #'about-xemacs
lisp/ChangeLog addition:
2017-05-30 Aidan Kehoe <kehoea(a)parhasard.net>
* about.el (about-xemacs):
Correct a recently-introduced bug here, give the correct bounding
keywords to #'parse-integer when working out the month of the
release date.
Don't check for xemacs-extra-name, xemacs-release-date being
#'boundp, we control src/emacs.c, and can ensure they always are.
src/ChangeLog addition:
2017-05-30 Aidan Kehoe <kehoea(a)parhasard.net>
* emacs.c (vars_of_emacs):
If there's no associated #define, initialise xemacs-extra-name to
nil.
diff -r 5465cf0baa42 -r b803128e4209 lisp/ChangeLog
--- a/lisp/ChangeLog Wed May 17 23:27:34 2017 +0100
+++ b/lisp/ChangeLog Tue May 30 20:30:25 2017 +0100
@@ -1,3 +1,12 @@
+2017-05-30 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * about.el (about-xemacs):
+ Correct a recently-introduced bug here, give the correct bounding
+ keywords to #'parse-integer when working out the month of the
+ release date.
+ Don't check for xemacs-extra-name, xemacs-release-date being
+ #'boundp, we control src/emacs.c, and can ensure they always are.
+
2017-03-15 Aidan Kehoe <kehoea(a)parhasard.net>
* make-docfile.el:
diff -r 5465cf0baa42 -r b803128e4209 lisp/about.el
--- a/lisp/about.el Wed May 17 23:27:34 2017 +0100
+++ b/lisp/about.el Tue May 30 20:30:25 2017 +0100
@@ -380,23 +380,20 @@
emacs-major-version
emacs-minor-version))))
(emacs-release-date
- (if (and (boundp 'xemacs-release-date)
- (stringp xemacs-release-date)
- (string-match "^\\([0-9]\\{4\\}\\)-\\([0-9][0-9]\\)-"
- xemacs-release-date))
+ (if (string-match "^\\([0-9]\\{4\\}\\)-\\([0-9][0-9]\\)-"
+ xemacs-release-date)
(format "%s %s"
(aref [ "January" "February" "March" "April"
"May" "June" "July" "August"
"September" "October" "November" "December"
]
(1- (parse-integer xemacs-release-date
- :start (match-beginning 2))))
+ :start (match-beginning 2)
+ :end (match-end 2))))
(match-string 1 xemacs-release-date))
"February 2005 (defaulted in about.el)"))
- (emacs-variant-info (if (and xemacs-extra-name
- (stringp xemacs-extra-name)
- (< 0 (length xemacs-extra-name)))
- (format " %s" xemacs-extra-name)
- ""))
+ (emacs-variant-info (if (< 0 (length xemacs-extra-name))
+ (concat " " xemacs-extra-name)
+ ""))
(emacs-about-version (format "version %s of %s%s"
emacs-short-version
emacs-release-date
diff -r 5465cf0baa42 -r b803128e4209 src/ChangeLog
--- a/src/ChangeLog Wed May 17 23:27:34 2017 +0100
+++ b/src/ChangeLog Tue May 30 20:30:25 2017 +0100
@@ -1,3 +1,9 @@
+2017-05-30 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * emacs.c (vars_of_emacs):
+ If there's no associated #define, initialise xemacs-extra-name to
+ nil.
+
2017-05-11 Aidan Kehoe <kehoea(a)parhasard.net>
* editfns.c (Fencode_time):
diff -r 5465cf0baa42 -r b803128e4209 src/emacs.c
--- a/src/emacs.c Wed May 17 23:27:34 2017 +0100
+++ b/src/emacs.c Tue May 30 20:30:25 2017 +0100
@@ -4392,6 +4392,8 @@
*/ );
#ifdef XEMACS_EXTRA_NAME
Vxemacs_extra_name = build_ascstring (XEMACS_EXTRA_NAME);
+#else
+ Vxemacs_extra_name = Qnil;
#endif
DEFVAR_LISP ("xemacs-release-date", &Vxemacs_release_date /*
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)