summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/files.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el
index aac5ebb1a64..1ca1369d250 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1151,9 +1151,8 @@ if you wish to pass an empty string as the argument."
nil
(expand-file-name filename))))
(or (equal filename buffer-file-name)
- (null filename)
(progn
- (lock-buffer filename)
+ (and filename (lock-buffer filename))
(unlock-buffer)))
(setq buffer-file-name filename)
(if filename ; make buffer name reflect filename.