changeset 5743:2257ac0e8a47

Merge.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sat, 22 Jun 2013 09:06:34 +0900
parents 7613e3de80b4 (diff) d11efddf3617 (current diff)
children 9c17f7be0b92 6325dc8d791c
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jun 21 08:44:33 2013 -0600
+++ b/lisp/ChangeLog	Sat Jun 22 09:06:34 2013 +0900
@@ -1,3 +1,8 @@
+2013-06-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* paragraphs.el (sentence-end-base):
+	Fix stupid omission of cast to string.
+
 2013-06-21  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Fix no-Mule build.
--- a/lisp/paragraphs.el	Fri Jun 21 08:44:33 2013 -0600
+++ b/lisp/paragraphs.el	Sat Jun 22 09:06:34 2013 +0900
@@ -182,7 +182,7 @@
 
 (defcustom sentence-end-base
   (concat "[.?!][]\"'"
-	  (if (featurep 'mule) (unicode-to-char #x201D) "")
+	  (if (featurep 'mule) (string (unicode-to-char #x201D)) "")
 	  ")}]*")
   "Regexp matching the basic end of a sentence, not including following space."
   :group 'paragraphs