diff lisp/prim/files.el @ 48:56c54cf7c5b6 r19-16b90

Import from CVS: tag r19-16b90
author cvs
date Mon, 13 Aug 2007 08:56:04 +0200
parents 8d2a9b52c682
children 131b0175ea99
line wrap: on
line diff
--- a/lisp/prim/files.el	Mon Aug 13 08:55:32 2007 +0200
+++ b/lisp/prim/files.el	Mon Aug 13 08:56:04 2007 +0200
@@ -1300,8 +1300,9 @@
 	      (val (cdr (car result))))
 	  (cond ((eq key 'mode)
 		 (setq mode-p t)
-		 (funcall (intern (concat (downcase (symbol-name val))
-					  "-mode"))))
+		 (and enable-local-variables
+		      (funcall (intern (concat (downcase (symbol-name val))
+					       "-mode")))))
 		(set-any-p
 		 (hack-one-local-variable key val))
 		(t
@@ -1949,7 +1950,7 @@
 `dired-kept-versions' controls dired's clean-directory (.) command.
 If `delete-old-versions' is nil, system will query user
  before trimming versions.  Otherwise it does it silently."
-  (interactive "p")
+  (interactive "_p")
   (let ((modp (buffer-modified-p))
 	(large (> (buffer-size) 50000))
 	(make-backup-files (or (and make-backup-files (not (eq args 0)))