From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 13 Jun 1998 04:44:32 +0000 (+0000)
Subject: (find-file-noselect): Delete unused local var `error'.
X-Git-Tag: emacs-20.3~613
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=666c1d8bab7378c72bf2449134b7df44d5cbc9d5;p=emacs.git

(find-file-noselect): Delete unused local var `error'.
(find-file-noselect-1): Add local var `error'.
---

diff --git a/lisp/files.el b/lisp/files.el
index 9768853c381..b952756d6ed 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -872,8 +872,7 @@ Optional second arg RAWFILE non-nil means the file is read literally."
 	   (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 @@ Optional second arg RAWFILE non-nil means the file is read literally."
       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)