[Emacs-diffs] /srv/bzr/emacs/trunk r107276: * lisp/minibuffer.el (read-file-name): Doc fix. (Bug#10798)

[Glenn Morris]

------------------------------------------------------------
revno: 107276
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-13 17:46:43 -0500
message:
  * lisp/minibuffer.el (read-file-name): Doc fix.  (Bug#10798)
  * src/gtkutil.c: Related comment.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el
  src/gtkutil.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-13 21:48:14 +0000
+++ b/lisp/ChangeLog    2012-02-13 22:46:43 +0000
@@ -1,3 +1,7 @@
+2012-02-13  Glenn Morris  <address@hidden>
+
+       * minibuffer.el (read-file-name): Doc fix.  (Bug#10798)
+
 2012-02-13  Teodor Zlatanov  <address@hidden>
 
        * net/gnutls.el (gnutls-trustfiles): New variable.

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2012-02-11 22:13:29 +0000
+++ b/lisp/minibuffer.el        2012-02-13 22:46:43 +0000
@@ -2011,12 +2011,19 @@
 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))
 

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2012-01-19 07:21:25 +0000
+++ b/src/gtkutil.c     2012-02-13 22:46:43 +0000
@@ -1741,8 +1741,9 @@
    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.  */