--- a/lisp/games/cookie1.el	Mon Aug 13 08:46:35 2007 +0200
+++ b/lisp/games/cookie1.el	Mon Aug 13 08:46:56 2007 +0200
@@ -21,9 +21,10 @@
 
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
 
-;;; Synched up with: FSF 19.28.
+;;; Synched up with: FSF 19.34.
 
 ;;; Commentary:
 
@@ -105,7 +106,7 @@
     (if sym
 	(symbol-value sym)
       (setq sym (intern phrase-file cookie-cache))
-      (message startmsg)
+      (message "%s" startmsg)
       (save-excursion
 	(let ((buf (generate-new-buffer "*cookie*"))
 	      (result nil))
@@ -116,6 +117,7 @@
 	  (while (progn (skip-chars-forward " \t\n\r\f") (not (eobp)))
 	    (let ((beg (point)))
 	      (re-search-forward cookie-delimiter)
+	      ;; XEmacs change
 	      ;; DBC --- here's the change
 	      ;; This used to be (buffer-substring beg (1- (point))),
 	      ;; which only worked if the regexp matched was one
@@ -124,7 +126,7 @@
 						   (match-beginning 0))
 				 result))))
 	  (kill-buffer buf)
-	  (message endmsg)
+	  (message "%s" endmsg)
 	  (set sym (apply 'vector result)))))))
 
 (defun read-cookie (prompt phrase-file startmsg endmsg &optional require-match)