1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/server.el b/lisp/server.el
index ec974659841..bcb79d6b9ac 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -511,7 +511,8 @@ so don't mark these buffers specially, just visit them normally."
         ;; If there is an existing buffer modified or the file is
         ;; modified, revert it.  If there is an existing buffer with
         ;; deleted file, offer to write it.
-        (let* ((minibuffer-auto-raise server-raise-frame)
+        (let* ((minibuffer-auto-raise (or server-raise-frame
+                                          minibuffer-auto-raise))
                (filen (car file))
                (obuf (get-file-buffer filen)))
           (add-to-history 'file-name-history filen)