# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 897713072 0
# Node ID 7e79814e726373e56ed8a232b11d16dce7032e03
# Parent  5dcb65955074f6327c4ff6bf5b85995729b964f2
(find-file-noselect): Delete unused local var `error'.
(find-file-noselect-1): Add local var `error'.

diff -r 5dcb65955074 -r 7e79814e7263 lisp/files.el
--- a/lisp/files.el	Sat Jun 13 04:34:52 1998 +0000
+++ b/lisp/files.el	Sat Jun 13 04:44:32 1998 +0000
@@ -872,8 +872,7 @@
 	   (truename (abbreviate-file-name (file-truename filename)))
 	   (number (nthcdr 10 (file-attributes truename)))
 	   ;; Find any buffer for a file which has same truename.
-	   (other (and (not buf) (find-buffer-visiting filename)))
-	   error)
+	   (other (and (not buf) (find-buffer-visiting filename))))
       ;; Let user know if there is a buffer with the same truename.
       (if other
 	  (progn
@@ -951,7 +950,8 @@
       buf)))
 
 (defun find-file-noselect-1 (buf filename nowarn rawfile truename number)
-  (let ((inhibit-read-only t))
+  (let ((inhibit-read-only t)
+	error)
     (with-current-buffer buf
       (kill-local-variable 'find-file-literally)
       (setq buffer-file-coding-system nil)