From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 12 Feb 1998 03:10:53 +0000 (+0000)
Subject: (cookie-snarf): Use match-beginning on the delimiter.
X-Git-Tag: emacs-20.3~2187
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bfaef6dca8d60fd79cc546a78571876610008185;p=emacs.git

(cookie-snarf): Use match-beginning on the delimiter.
(cookie-delimiter): Handle single-% delimiter.
---

diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 3f8087fa2fa..9e8412d17f1 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -57,7 +57,7 @@
 ; Randomize the seed in the random number generator.
 (random t)
 
-(defconst cookie-delimiter "\n%%\n\\|\0"
+(defconst cookie-delimiter "\n%%\n\\|\n%\n\\|\0"
   "Delimiter used to separate cookie file entries.")
 
 (defvar cookie-cache (make-vector 511 0)
@@ -115,7 +115,7 @@ and subsequent calls on the same file won't go to disk."
 	  (while (progn (skip-chars-forward " \t\n\r\f") (not (eobp)))
 	    (let ((beg (point)))
 	      (re-search-forward cookie-delimiter)
-	      (setq result (cons (buffer-substring beg (1- (point)))
+	      (setq result (cons (buffer-substring beg (match-beginning 0))
 				 result))))
 	  (kill-buffer buf)
 	  (message "%s" endmsg)