* cookie1.el (cookie-snarf): Explicit error if input file cannot be read.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68225f1bec8c1ee0f40030d873bfc263bd921616..398d74b124f95b62d7c67beb48318c80f3e1ec5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-16  Glenn Morris  <rgm@gnu.org>
 
+       * play/cookie1.el (cookie-snarf):
+       Give an explicit error if input file cannot be read.
+
        * play/yow.el (yow-file): Use expand-file-name rather than concat.
 
        * progmodes/perl-mode.el (c-macro-expand):

diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 06bd962d9257fb6a3dbed750c5b4864d1d785dd7..cbf29a26a713bf1bd7c4d95c2f068d0d5d8a1d92 100644 (file)
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -96,6 +96,8 @@ of load, ENDMSG at the end."
   "Reads in the PHRASE-FILE, returns it as a vector of strings.
 Emit STARTMSG and ENDMSG before and after.  Caches the result; second
 and subsequent calls on the same file won't go to disk."
+  (or (file-readable-p phrase-file)
+      (error "Cannot read file `%s'" phrase-file))
   (let ((sym (intern-soft phrase-file cookie-cache)))
     (and sym (not (equal (symbol-function sym)
                         (nth 5 (file-attributes phrase-file))))