diff options
| author | Stefan Monnier | 2007-07-07 05:28:29 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-07-07 05:28:29 +0000 |
| commit | 75f6af19287c17c8aff2d11ae8b8dba437d00c14 (patch) | |
| tree | 6d221bbd34c039124684f815c4a41a5a188abff0 | |
| parent | 0b7750a95dffb8cb8095a5c9ca4e9df1cf7acd54 (diff) | |
| download | emacs-75f6af19287c17c8aff2d11ae8b8dba437d00c14.tar.gz emacs-75f6af19287c17c8aff2d11ae8b8dba437d00c14.zip | |
(find-file-confirm-nonexistent-file): Rename from
find-file-confirm-inexistent-file. Update users.
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/files.el | 14 |
3 files changed, 11 insertions, 8 deletions
| @@ -34,7 +34,7 @@ a GIF library. | |||
| 34 | 34 | ||
| 35 | * Changes in Emacs 23.1 | 35 | * Changes in Emacs 23.1 |
| 36 | 36 | ||
| 37 | ** If you set find-file-confirm-inexistent-file to t, then C-x C-f | 37 | ** If you set find-file-confirm-nonexistent-file to t, then C-x C-f |
| 38 | requires confirmation before opening a non-existent file. | 38 | requires confirmation before opening a non-existent file. |
| 39 | 39 | ||
| 40 | ** If the gpm mouse server is running and t-mouse-mode enabled, Emacs uses a | 40 | ** 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 @@ | |||
| 1 | 2007-07-07 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-07-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * files.el (find-file-confirm-nonexistent-file): Rename from | ||
| 4 | find-file-confirm-inexistent-file. Update users. | ||
| 5 | |||
| 3 | * emacs-lisp/autoload.el (autoload-find-destination): Understand a new | 6 | * emacs-lisp/autoload.el (autoload-find-destination): Understand a new |
| 4 | format of autoload block where the file's time-stamp is replaced by its | 7 | format of autoload block where the file's time-stamp is replaced by its |
| 5 | MD5 checksum. | 8 | 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." | |||
| 1051 | ,@body) | 1051 | ,@body) |
| 1052 | (remove-hook 'minibuffer-setup-hook ,hook))))) | 1052 | (remove-hook 'minibuffer-setup-hook ,hook))))) |
| 1053 | 1053 | ||
| 1054 | (defcustom find-file-confirm-inexistent-file nil | 1054 | (defcustom find-file-confirm-nonexistent-file nil |
| 1055 | "If non-nil, `find-file' requires confirmation before visiting a new file." | 1055 | "If non-nil, `find-file' requires confirmation before visiting a new file." |
| 1056 | :group 'find-file | 1056 | :group 'find-file |
| 1057 | :version "23.1" | 1057 | :version "23.1" |
| @@ -1082,7 +1082,7 @@ To visit a file without any kind of conversion and without | |||
| 1082 | automatically choosing a major mode, use \\[find-file-literally]." | 1082 | automatically choosing a major mode, use \\[find-file-literally]." |
| 1083 | (interactive | 1083 | (interactive |
| 1084 | (find-file-read-args "Find file: " | 1084 | (find-file-read-args "Find file: " |
| 1085 | (if find-file-confirm-inexistent-file 'confirm-only))) | 1085 | (if find-file-confirm-nonexistent-file 'confirm-only))) |
| 1086 | (let ((value (find-file-noselect filename nil nil wildcards))) | 1086 | (let ((value (find-file-noselect filename nil nil wildcards))) |
| 1087 | (if (listp value) | 1087 | (if (listp value) |
| 1088 | (mapcar 'switch-to-buffer (nreverse value)) | 1088 | (mapcar 'switch-to-buffer (nreverse value)) |
| @@ -1101,7 +1101,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp, | |||
| 1101 | expand wildcards (if any) and visit multiple files." | 1101 | expand wildcards (if any) and visit multiple files." |
| 1102 | (interactive | 1102 | (interactive |
| 1103 | (find-file-read-args "Find file in other window: " | 1103 | (find-file-read-args "Find file in other window: " |
| 1104 | (if find-file-confirm-inexistent-file 'confirm-only))) | 1104 | (if find-file-confirm-nonexistent-file 'confirm-only))) |
| 1105 | (let ((value (find-file-noselect filename nil nil wildcards))) | 1105 | (let ((value (find-file-noselect filename nil nil wildcards))) |
| 1106 | (if (listp value) | 1106 | (if (listp value) |
| 1107 | (progn | 1107 | (progn |
| @@ -1123,7 +1123,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp, | |||
| 1123 | expand wildcards (if any) and visit multiple files." | 1123 | expand wildcards (if any) and visit multiple files." |
| 1124 | (interactive | 1124 | (interactive |
| 1125 | (find-file-read-args "Find file in other frame: " | 1125 | (find-file-read-args "Find file in other frame: " |
| 1126 | (if find-file-confirm-inexistent-file 'confirm-only))) | 1126 | (if find-file-confirm-nonexistent-file 'confirm-only))) |
| 1127 | (let ((value (find-file-noselect filename nil nil wildcards))) | 1127 | (let ((value (find-file-noselect filename nil nil wildcards))) |
| 1128 | (if (listp value) | 1128 | (if (listp value) |
| 1129 | (progn | 1129 | (progn |
| @@ -1148,7 +1148,7 @@ Like \\[find-file] but marks buffer as read-only. | |||
| 1148 | Use \\[toggle-read-only] to permit editing." | 1148 | Use \\[toggle-read-only] to permit editing." |
| 1149 | (interactive | 1149 | (interactive |
| 1150 | (find-file-read-args "Find file read-only: " | 1150 | (find-file-read-args "Find file read-only: " |
| 1151 | (if find-file-confirm-inexistent-file 'confirm-only))) | 1151 | (if find-file-confirm-nonexistent-file 'confirm-only))) |
| 1152 | (unless (or (and wildcards find-file-wildcards | 1152 | (unless (or (and wildcards find-file-wildcards |
| 1153 | (not (string-match "\\`/:" filename)) | 1153 | (not (string-match "\\`/:" filename)) |
| 1154 | (string-match "[[*?]" filename)) | 1154 | (string-match "[[*?]" filename)) |
| @@ -1165,7 +1165,7 @@ Like \\[find-file-other-window] but marks buffer as read-only. | |||
| 1165 | Use \\[toggle-read-only] to permit editing." | 1165 | Use \\[toggle-read-only] to permit editing." |
| 1166 | (interactive | 1166 | (interactive |
| 1167 | (find-file-read-args "Find file read-only other window: " | 1167 | (find-file-read-args "Find file read-only other window: " |
| 1168 | (if find-file-confirm-inexistent-file 'confirm-only))) | 1168 | (if find-file-confirm-nonexistent-file 'confirm-only))) |
| 1169 | (unless (or (and wildcards find-file-wildcards | 1169 | (unless (or (and wildcards find-file-wildcards |
| 1170 | (not (string-match "\\`/:" filename)) | 1170 | (not (string-match "\\`/:" filename)) |
| 1171 | (string-match "[[*?]" filename)) | 1171 | (string-match "[[*?]" filename)) |
| @@ -1182,7 +1182,7 @@ Like \\[find-file-other-frame] but marks buffer as read-only. | |||
| 1182 | Use \\[toggle-read-only] to permit editing." | 1182 | Use \\[toggle-read-only] to permit editing." |
| 1183 | (interactive | 1183 | (interactive |
| 1184 | (find-file-read-args "Find file read-only other frame: " | 1184 | (find-file-read-args "Find file read-only other frame: " |
| 1185 | (if find-file-confirm-inexistent-file 'confirm-only))) | 1185 | (if find-file-confirm-nonexistent-file 'confirm-only))) |
| 1186 | (unless (or (and wildcards find-file-wildcards | 1186 | (unless (or (and wildcards find-file-wildcards |
| 1187 | (not (string-match "\\`/:" filename)) | 1187 | (not (string-match "\\`/:" filename)) |
| 1188 | (string-match "[[*?]" filename)) | 1188 | (string-match "[[*?]" filename)) |