procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/minibuffer.el (read-file-name): Doc fix. (Bug#10798)

Browse source 
* src/gtkutil.c: Related comment.
This commit is contained in:
Glenn Morris 2012-02-13 17:46:43 -05:00
parent 20d6487ebb
commit 2605051a7f
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-13 Glenn Morris <rgm@gnu.org>
* minibuffer.el (read-file-name): Doc fix. (Bug#10798)
2012-02-13 Teodor Zlatanov <tzz@lifelogs.com>
* net/gnutls.el (gnutls-trustfiles): New variable.

13
lisp/minibuffer.el
View file

@ -2011,12 +2011,19 @@ DIR should be an absolute directory name. It defaults to the value of
If this command was invoked with the mouse, use a graphical file
dialog if `use-dialog-box' is non-nil, and the window system or X
toolkit in use provides a file dialog box, and DIR is not a
remote file. For graphical file dialogs, any the special values
of MUSTMATCH; `confirm' and `confirm-after-completion' are
treated as equivalent to nil.
remote file. For graphical file dialogs, any of the special values
of MUSTMATCH `confirm' and `confirm-after-completion' are
treated as equivalent to nil. Some graphical file dialogs respect
a MUSTMATCH value of t, and some do not (or it only has a cosmetic
effect, but does not actually prevent the user from entering a
non-existent file).
See also `read-file-name-completion-ignore-case'
and `read-file-name-function'."
;; If x-gtk-use-old-file-dialog = t (xg_get_file_with_selection),
;; then MUSTMATCH is enforced. But with newer Gtk
;; (xg_get_file_with_chooser), it only has a cosmetic effect.
;; The user can still type a non-existent file name.
(funcall (or read-file-name-function #'read-file-name-default)
prompt dir default-filename mustmatch initial predicate))

5
src/gtkutil.c
View file

@ -1741,8 +1741,9 @@ xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data)
PROMPT is a prompt to show to the user. May not be NULL.
DEFAULT_FILENAME is a default selection to be displayed. May be NULL.
If MUSTMATCH_P is non-zero, the returned file name must be an existing
file. *FUNC is set to a function that can be used to retrieve the
selected file name from the returned widget.
file. (Actually, this only has cosmetic effects, the user can
still enter a non-existing file.) *FUNC is set to a function that
can be used to retrieve the selected file name from the returned widget.
Returns the created widget. */