changeset: 5484:d12a0c55b174
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Apr 30 13:04:47 2011 +0900
files: CHANGES-beta lisp/ChangeLog lisp/faces.el src/ChangeLog src/specifier.c
description:
[mq]: matchspec
diff -r 156c1a62a82d -r d12a0c55b174 CHANGES-beta
--- a/CHANGES-beta Sat Apr 30 12:57:04 2011 +0900
+++ b/CHANGES-beta Sat Apr 30 13:04:47 2011 +0900
@@ -1,4 +1,16 @@
# DO NOT PUT A VERSION MARKER HERE, ADDED AT RELEASE
+
+Major Features and Backward Incompatible Changes
+User-Visible Bug Fixes and Minor Improvements
+
+-- improve: Backward-compatible MATCHSPEC in face-property-matching-instance. -- Stephen Turnbull
+
+Build Infrastructure and Source Tree
+Documentation
+Lisp API
+Internal API and Implementation
+Testing and Debugging
+
to XEmacs 21.5.31 "ginger"
diff -r 156c1a62a82d -r d12a0c55b174 lisp/ChangeLog
--- a/lisp/ChangeLog Sat Apr 30 12:57:04 2011 +0900
+++ b/lisp/ChangeLog Sat Apr 30 13:04:47 2011 +0900
@@ -1,6 +1,11 @@
2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.31 "ginger" is released.
+
+2011-04-30 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * faces.el (face-property-matching-instance):
+ Allow backward compatibility to the 21.4 API. Update docstring.
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
diff -r 156c1a62a82d -r d12a0c55b174 lisp/faces.el
--- a/lisp/faces.el Sat Apr 30 12:57:04 2011 +0900
+++ b/lisp/faces.el Sat Apr 30 13:04:47 2011 +0900
@@ -238,16 +238,19 @@
&optional domain default
no-fallback)
"Return the instance of FACE's PROPERTY matching MATCHSPEC in DOMAIN.
-Currently the only useful value for MATCHSPEC is a charset, when used
-in conjunction with the face's font; this allows you to retrieve a
-font that can be used to display a particular charset, rather than just
-any font.
+Currently MATCHSPEC is used only for the 'font property, when its value
+should be a cons \(CHARSET . STAGE) \(see `specifier-matching-instance'
+for a full description of the matching process). This allows you to
+retrieve a font that can be used to display a particular charset, rather
+than just any font. For backward compatibility, MATCHSPEC may be a
+charset, which is interpreted as \(CHARSET . final).
-Other than MATCHSPEC, this function is identical to `face-property-instance'.
-See also `specifier-matching-instance' for a fuller description of the
-matching process."
+See `face-property-instance' for usage of the other arguments."
(setq face (get-face face))
+ ;; For compatibility with 21.4-oriented code, eg, x-symbol-mule.el.
+ (when (charsetp matchspec)
+ (setq matchspec (cons matchspec 'final)))
(let ((value (get face property)))
(when (specifierp value)
(setq value (specifier-matching-instance value matchspec domain
diff -r 156c1a62a82d -r d12a0c55b174 src/ChangeLog
--- a/src/ChangeLog Sat Apr 30 12:57:04 2011 +0900
+++ b/src/ChangeLog Sat Apr 30 13:04:47 2011 +0900
@@ -1,6 +1,11 @@
2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.31 "ginger" is released.
+
+2011-04-30 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * specifier.c (Fspecifier_matching_instance):
+ Add comment about backward-incompatibility of MATCHSPEC.
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
diff -r 156c1a62a82d -r d12a0c55b174 src/specifier.c
--- a/src/specifier.c Sat Apr 30 12:57:04 2011 +0900
+++ b/src/specifier.c Sat Apr 30 13:04:47 2011 +0900
@@ -3171,6 +3171,10 @@
no_fallback, 1);
}
+/* MATCHSPEC is backward-incompatible with code written to 21.4's API.
+ So far such code has been seen only in x-symbol-mule.el, and that
+ was addressed by a change `face-property-matching-instance'.
+ See tracker issue752 for a more general patch against 21.5.29. */
DEFUN ("specifier-matching-instance", Fspecifier_matching_instance, 2, 5, 0, /*
Return an instance for SPECIFIER in DOMAIN that matches MATCHSPEC.
If no instance can be generated for this domain, return DEFAULT.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
changeset: 5482:384423af8fb5
tag: r21-5-31
tag: r21-5-latest-beta
tag: first-gplv3
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Apr 30 12:50:14 2011 +0900
files: CHANGES-beta
description:
Update CHANGES-beta.
diff -r 5008a40f7460 -r 384423af8fb5 CHANGES-beta
--- a/CHANGES-beta Fri Apr 29 22:57:14 2011 +0900
+++ b/CHANGES-beta Sat Apr 30 12:50:14 2011 +0900
@@ -2,9 +2,9 @@
to XEmacs 21.5.31 "ginger"
-Internal API and Implementation
+Major Features and Backward Incompatible Changes
--- improve: Verify copyright status and restrict license to GPL version 3 or later. -- Mats Lidell, Mike Sperber, Jerry James, Ben Wing, Stephen Turnbull
+-- improve: Verify copyright status and restrict license to GPL version 3 or later. -- Mats Lidell, Mike Sperber, Stephen Turnbull (see hg log)
to XEmacs 21.5.30 "garlic"
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
changeset: 5480:f5a0b32f4687
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Fri Apr 29 22:57:14 2011 +0900
files: ChangeLog configure etc/ChangeLog lib-src/ChangeLog lisp/ChangeLog lwlib/ChangeLog man/ChangeLog modules/ChangeLog nt/ChangeLog src/ChangeLog tests/ChangeLog version.sh.in
description:
XEmacs 21.5.31 "ginger" is released.
diff -r 7a9941581bac -r f5a0b32f4687 ChangeLog
--- a/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 configure
--- a/configure Fri Apr 29 20:36:26 2011 +0900
+++ b/configure Fri Apr 29 22:57:14 2011 +0900
@@ -33,17 +33,17 @@
# in the this directory. You must have autoconf version 2.59.
#
# This file is part of XEmacs.
-#
+#
# XEmacs is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
-#
+#
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
#
@@ -2130,20 +2130,18 @@
This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
For usage, run `./configure --help'
For more detailed information on building and installing XEmacs,
diff -r 7a9941581bac -r f5a0b32f4687 etc/ChangeLog
--- a/etc/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/etc/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2010-12-31 Mats Lidell <matsl(a)xemacs.org>
* xemacs.1: Added copyright and license.
diff -r 7a9941581bac -r f5a0b32f4687 lib-src/ChangeLog
--- a/lib-src/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/lib-src/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/lisp/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 lwlib/ChangeLog
--- a/lwlib/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/lwlib/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 man/ChangeLog
--- a/man/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/man/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 modules/ChangeLog
--- a/modules/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/modules/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 nt/ChangeLog
--- a/nt/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/nt/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 src/ChangeLog
--- a/src/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/src/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 tests/ChangeLog
--- a/tests/ChangeLog Fri Apr 29 20:36:26 2011 +0900
+++ b/tests/ChangeLog Fri Apr 29 22:57:14 2011 +0900
@@ -1,3 +1,7 @@
+2011-04-29 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * XEmacs 21.5.31 "ginger" is released.
+
2011-04-26 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.30 "garlic" is released.
diff -r 7a9941581bac -r f5a0b32f4687 version.sh.in
--- a/version.sh.in Fri Apr 29 20:36:26 2011 +0900
+++ b/version.sh.in Fri Apr 29 22:57:14 2011 +0900
@@ -2,11 +2,11 @@
emacs_is_beta=t
emacs_major_version=21
emacs_minor_version=5
-emacs_beta_version=30
-xemacs_codename="garlic"
+emacs_beta_version=31
+xemacs_codename="ginger"
emacs_kit_version=
infodock_major_version=
infodock_minor_version=
infodock_build_version=
-xemacs_release_date="2011-04-27"
+xemacs_release_date="2011-04-29"
xemacs_extra_name=
\ No newline at end of file
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
changeset: 5479:7a9941581bac
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Fri Apr 29 20:36:26 2011 +0900
files: CHANGES-beta
description:
Insert heralds for 21.5.30 and 21.5.31.
diff -r 7a86df313e0e -r 7a9941581bac CHANGES-beta
--- a/CHANGES-beta Fri Apr 29 20:33:47 2011 +0900
+++ b/CHANGES-beta Fri Apr 29 20:36:26 2011 +0900
@@ -1,8 +1,12 @@
-# DO NOT PUT A VERSION MARKER HERE, AUTOMATICALLY ADDED AT RELEASE
+# DO NOT PUT A VERSION MARKER HERE, ADDED AT RELEASE
+
+to XEmacs 21.5.31 "ginger"
Internal API and Implementation
--- improve: Verify copyright status and restrict license to GPL version 3 or later. -- Mats Lidell, Mike Sperber, Jerry James, Ben Wing
+-- improve: Verify copyright status and restrict license to GPL version 3 or later. -- Mats Lidell, Mike Sperber, Jerry James, Ben Wing, Stephen Turnbull
+
+to XEmacs 21.5.30 "garlic"
Major Features and Backward Incompatible Changes
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
changeset: 5478:7a86df313e0e
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Fri Apr 29 20:33:47 2011 +0900
files: CHANGES-beta
description:
Update CHANGES-beta for 21.5.31.
diff -r 90dcf2376909 -r 7a86df313e0e CHANGES-beta
--- a/CHANGES-beta Fri Apr 29 02:35:13 2011 +0900
+++ b/CHANGES-beta Fri Apr 29 20:33:47 2011 +0900
@@ -1,4 +1,8 @@
# DO NOT PUT A VERSION MARKER HERE, AUTOMATICALLY ADDED AT RELEASE
+
+Internal API and Implementation
+
+-- improve: Verify copyright status and restrict license to GPL version 3 or later. -- Mats Lidell, Mike Sperber, Jerry James, Ben Wing
Major Features and Backward Incompatible Changes
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches