3 files changed, 11 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 95090c94158..c8d158c46b1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -34,7 +34,7 @@ a GIF library.
 
 * Changes in Emacs 23.1
 
-** If you set find-file-confirm-inexistent-file to t, then C-x C-f
+** If you set find-file-confirm-nonexistent-file to t, then C-x C-f
 requires confirmation before opening a non-existent file.
 
 ** If the gpm mouse server is running and t-mouse-mode enabled, Emacs uses a
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb79ea47bb2..fc0c6556026 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * files.el (find-file-confirm-nonexistent-file): Rename from
+        find-file-confirm-inexistent-file.  Update users.
+
         * emacs-lisp/autoload.el (autoload-find-destination): Understand a new
         format of autoload block where the file's time-stamp is replaced by its
         MD5 checksum.
diff --git a/lisp/files.el b/lisp/files.el
index 873eeee7199..69ed54c5633 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1051,7 +1051,7 @@ Recursive uses of the minibuffer will not be affected."
              ,@body)
          (remove-hook 'minibuffer-setup-hook ,hook)))))
 
-(defcustom find-file-confirm-inexistent-file nil
+(defcustom find-file-confirm-nonexistent-file nil
   "If non-nil, `find-file' requires confirmation before visiting a new file."
   :group 'find-file
   :version "23.1"
@@ -1082,7 +1082,7 @@ To visit a file without any kind of conversion and without
 automatically choosing a major mode, use \\[find-file-literally]."
   (interactive
    (find-file-read-args "Find file: "
-                        (if find-file-confirm-inexistent-file 'confirm-only)))
+                        (if find-file-confirm-nonexistent-file 'confirm-only)))
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
         (mapcar 'switch-to-buffer (nreverse value))
@@ -1101,7 +1101,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp,
 expand wildcards (if any) and visit multiple files."
   (interactive
    (find-file-read-args "Find file in other window: "
-                        (if find-file-confirm-inexistent-file 'confirm-only)))
+                        (if find-file-confirm-nonexistent-file 'confirm-only)))
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
         (progn
@@ -1123,7 +1123,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp,
 expand wildcards (if any) and visit multiple files."
   (interactive
    (find-file-read-args "Find file in other frame: "
-                        (if find-file-confirm-inexistent-file 'confirm-only)))
+                        (if find-file-confirm-nonexistent-file 'confirm-only)))
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
         (progn
@@ -1148,7 +1148,7 @@ Like \\[find-file] but marks buffer as read-only.
 Use \\[toggle-read-only] to permit editing."
   (interactive
    (find-file-read-args "Find file read-only: "
-                        (if find-file-confirm-inexistent-file 'confirm-only)))
+                        (if find-file-confirm-nonexistent-file 'confirm-only)))
   (unless (or (and wildcards find-file-wildcards
                    (not (string-match "\\`/:" filename))
                    (string-match "[[*?]" filename))
@@ -1165,7 +1165,7 @@ Like \\[find-file-other-window] but marks buffer as read-only.
 Use \\[toggle-read-only] to permit editing."
   (interactive
    (find-file-read-args "Find file read-only other window: "
-                        (if find-file-confirm-inexistent-file 'confirm-only)))
+                        (if find-file-confirm-nonexistent-file 'confirm-only)))
   (unless (or (and wildcards find-file-wildcards
                    (not (string-match "\\`/:" filename))
                    (string-match "[[*?]" filename))
@@ -1182,7 +1182,7 @@ Like \\[find-file-other-frame] but marks buffer as read-only.
 Use \\[toggle-read-only] to permit editing."
   (interactive
    (find-file-read-args "Find file read-only other frame: "
-                        (if find-file-confirm-inexistent-file 'confirm-only)))
+                        (if find-file-confirm-nonexistent-file 'confirm-only)))
   (unless (or (and wildcards find-file-wildcards
                    (not (string-match "\\`/:" filename))
                    (string-match "[[*?]" filename))