diff options
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 17 | 
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/files.el b/lisp/files.el index 1bb140c0562..c8a75f67820 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3640,14 +3640,15 @@ is found.  Returns the new class name."        (condition-case err  	  (progn  	    (insert-file-contents file) -	    (let* ((dir-name (file-name-directory file)) -		   (class-name (intern dir-name)) -		   (variables (let ((read-circle nil)) -				(read (current-buffer))))) -	      (dir-locals-set-class-variables class-name variables) -	      (dir-locals-set-directory-class dir-name class-name -					      (nth 5 (file-attributes file))) -	      class-name)) +	    (unless (zerop (buffer-size)) +	      (let* ((dir-name (file-name-directory file)) +		     (class-name (intern dir-name)) +		     (variables (let ((read-circle nil)) +				  (read (current-buffer))))) +		(dir-locals-set-class-variables class-name variables) +		(dir-locals-set-directory-class dir-name class-name +						(nth 5 (file-attributes file))) +		class-name)))  	(error (message "Error reading dir-locals: %S" err) nil)))))  (defcustom enable-remote-dir-locals nil  | 
