diff options
| author | Glenn Morris | 2012-02-13 17:46:43 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-02-13 17:46:43 -0500 |
| commit | 2605051a7f2cb2dbae1a87a34940cc38c682eb1d (patch) | |
| tree | 36906545645166548ac97438f798e6a407869d0a /lisp | |
| parent | 20d6487ebbe0f04072c741e29f06d0132e282ff9 (diff) | |
| download | emacs-2605051a7f2cb2dbae1a87a34940cc38c682eb1d.tar.gz emacs-2605051a7f2cb2dbae1a87a34940cc38c682eb1d.zip | |
* lisp/minibuffer.el (read-file-name): Doc fix. (Bug#10798)
* src/gtkutil.c: Related comment.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/minibuffer.el | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bbbfb8dd000..5c7e8f2e8f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-02-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * minibuffer.el (read-file-name): Doc fix. (Bug#10798) | ||
| 4 | |||
| 1 | 2012-02-13 Teodor Zlatanov <tzz@lifelogs.com> | 5 | 2012-02-13 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 6 | ||
| 3 | * net/gnutls.el (gnutls-trustfiles): New variable. | 7 | * net/gnutls.el (gnutls-trustfiles): New variable. |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 913bfeba0ca..3cdece57e70 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -2011,12 +2011,19 @@ DIR should be an absolute directory name. It defaults to the value of | |||
| 2011 | If this command was invoked with the mouse, use a graphical file | 2011 | If this command was invoked with the mouse, use a graphical file |
| 2012 | dialog if `use-dialog-box' is non-nil, and the window system or X | 2012 | dialog if `use-dialog-box' is non-nil, and the window system or X |
| 2013 | toolkit in use provides a file dialog box, and DIR is not a | 2013 | toolkit in use provides a file dialog box, and DIR is not a |
| 2014 | remote file. For graphical file dialogs, any the special values | 2014 | remote file. For graphical file dialogs, any of the special values |
| 2015 | of MUSTMATCH; `confirm' and `confirm-after-completion' are | 2015 | of MUSTMATCH `confirm' and `confirm-after-completion' are |
| 2016 | treated as equivalent to nil. | 2016 | treated as equivalent to nil. Some graphical file dialogs respect |
| 2017 | a MUSTMATCH value of t, and some do not (or it only has a cosmetic | ||
| 2018 | effect, but does not actually prevent the user from entering a | ||
| 2019 | non-existent file). | ||
| 2017 | 2020 | ||
| 2018 | See also `read-file-name-completion-ignore-case' | 2021 | See also `read-file-name-completion-ignore-case' |
| 2019 | and `read-file-name-function'." | 2022 | and `read-file-name-function'." |
| 2023 | ;; If x-gtk-use-old-file-dialog = t (xg_get_file_with_selection), | ||
| 2024 | ;; then MUSTMATCH is enforced. But with newer Gtk | ||
| 2025 | ;; (xg_get_file_with_chooser), it only has a cosmetic effect. | ||
| 2026 | ;; The user can still type a non-existent file name. | ||
| 2020 | (funcall (or read-file-name-function #'read-file-name-default) | 2027 | (funcall (or read-file-name-function #'read-file-name-default) |
| 2021 | prompt dir default-filename mustmatch initial predicate)) | 2028 | prompt dir default-filename mustmatch initial predicate)) |
| 2022 | 2029 | ||