[Emacs-diffs] /srv/bzr/emacs/trunk r107932: * cookie1.el (cookie-snarf): Explicit error if input file cannot be read.

[Glenn Morris]

------------------------------------------------------------
revno: 107932
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-16 15:04:27 -0400
message:
  * cookie1.el (cookie-snarf): Explicit error if input file cannot be read.
modified:
  lisp/ChangeLog
  lisp/play/cookie1.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-16 19:02:59 +0000
+++ b/lisp/ChangeLog    2012-04-16 19:04:27 +0000
@@ -1,5 +1,8 @@
 2012-04-16  Glenn Morris  <address@hidden>
 
+       * 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):

=== modified file 'lisp/play/cookie1.el'
--- a/lisp/play/cookie1.el      2012-01-19 07:21:25 +0000
+++ b/lisp/play/cookie1.el      2012-04-16 19:04:27 +0000
@@ -96,6 +96,8 @@
   "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))))