# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1225068711 -32400
# Node ID 279cadceaa13bf3ccae066cb71092466e6175fc1
# Parent  bbce7f6de2d61e0c1852d90d99b94cefb9bd53d2# Parent  41c84a94258b8689c6af62e04ef3c2abcbe0db58
Merge in doc and test changes from September 2008.

diff -r bbce7f6de2d6 -r 279cadceaa13 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 26 21:26:42 2008 +0900
+++ b/lisp/ChangeLog	Mon Oct 27 09:51:51 2008 +0900
@@ -1,3 +1,13 @@
+2008-09-30  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* version.el (xemacs-betaname):
+	Document relation to other version variables.
+
+2008-09-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* subr.el (with-string-as-buffer-contents):
+	Document initial position of point.
+
 2008-08-31  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* window.el (only-window-p): New.
diff -r bbce7f6de2d6 -r 279cadceaa13 lisp/subr.el
--- a/lisp/subr.el	Sun Oct 26 21:26:42 2008 +0900
+++ b/lisp/subr.el	Mon Oct 27 09:51:51 2008 +0900
@@ -645,6 +645,7 @@
 ;; Moved from mule-coding.el.
 (defmacro with-string-as-buffer-contents (str &rest body)
   "With the contents of the current buffer being STR, run BODY.
+Point starts positioned to end of buffer.
 Returns the new contents of the buffer, as modified by BODY.
 The original current buffer is restored afterwards."
   `(with-temp-buffer
diff -r bbce7f6de2d6 -r 279cadceaa13 lisp/version.el
--- a/lisp/version.el	Sun Oct 26 21:26:42 2008 +0900
+++ b/lisp/version.el	Mon Oct 27 09:51:51 2008 +0900
@@ -33,7 +33,9 @@
 (defconst xemacs-betaname
   (and emacs-beta-version (format "(beta%d)" emacs-beta-version))
   "Non-nil when this is a test (beta) version of XEmacs.
-Warning, this variable did not exist in XEmacs versions prior to 20.3")
+Warning, this variable did not exist in XEmacs versions prior to 20.3.
+It value is derived from `emacs-beta-version'.  It is mutually exclusive
+with `emacs-patch-level'.")
 
 (defconst emacs-version
   (format "%d.%d %s%s%s%s%s"
diff -r bbce7f6de2d6 -r 279cadceaa13 tests/ChangeLog
--- a/tests/ChangeLog	Sun Oct 26 21:26:42 2008 +0900
+++ b/tests/ChangeLog	Mon Oct 27 09:51:51 2008 +0900
@@ -1,3 +1,12 @@
+2008-09-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/regexp-tests.el: Add test for at_dot regexp.
+
+2008-09-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/regexp-tests.el: `with-string-as-buffer-contents'
+	leaves point at end of buffer, so must move point to beginning.
+
 2008-08-27  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/regexp-tests.el: 
diff -r bbce7f6de2d6 -r 279cadceaa13 tests/automated/regexp-tests.el
--- a/tests/automated/regexp-tests.el	Sun Oct 26 21:26:42 2008 +0900
+++ b/tests/automated/regexp-tests.el	Mon Oct 27 09:51:51 2008 +0900
@@ -526,6 +526,7 @@
 
 (with-string-as-buffer-contents 
     "-]-----------------------------][]]------------------------"
+  (goto-char (point-min))
   (skip-chars-forward (skip-chars-quote "-[]"))
   (Assert (= (point) (point-max)))
   (skip-chars-backward (skip-chars-quote "-[]"))
@@ -544,3 +545,21 @@
 ;; via `replace-regexp-in-string', but we should specifically test bogus
 ;; combinations of STRING and STRBUFFER.
 
+;; empty string at point
+;; Thanks Julian Bradford on XEmacs Beta
+;; <18652.54975.894512.880956@krk.inf.ed.ac.uk>
+(with-string-as-buffer-contents "aáa"
+  (goto-char (point-min))
+  (Assert (looking-at "\\="))
+  (Assert (= (re-search-forward "\\=") 1))
+  (forward-char 1)
+  (Assert (looking-at "\\="))
+  (Assert (= (re-search-forward "\\=") 2))
+  (forward-char 1)
+  (Assert (looking-at "\\="))
+  (Assert (= (re-search-forward "\\=") 3))
+  (forward-char 1)
+  (Assert (looking-at "\\="))
+  (Assert (= (re-search-forward "\\=") 4)))
+
+