# HG changeset patch
# User Rüdiger Sonderfeld <ruediger@c-plusplus.de>
# Date 1380922358 -7200
# Node ID 9ff04de067ce6b3bfbff486d6b15b5eb3f25c09a
# Parent  a13ff452153828c89a42ca382b115a84093143db
improve .dir-locals.el

* .dir-local.el: Don't fail if buffer-file-name returns nil.
Use str-match-p instead of str-match.  Simplify logic.

diff --git a/.dir-locals.el b/.dir-locals.el
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,9 +2,10 @@
       ((c-file-style . "gnu")
        (indent-tabs-mode . nil)
        (fill-column . 72)
-       (eval . (when (string-match "\\.h\\'" (buffer-file-name))
-                 (unless (string-match "/gnulib/" (buffer-file-name))
-                   (c++-mode)
-                   (c-set-style "gnu"))))))
+       (eval . (when (and (buffer-file-name)
+                          (string-match-p "\\.h\\'" (buffer-file-name))
+                          (not (string-match-p "/gnulib/" (buffer-file-name))))
+                 (c++-mode)
+                 (c-set-style "gnu")))))
  (change-log-mode . ((indent-tabs-mode . t)))
  (makefile-mode . ((indent-tabs-mode . t))))