1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

* src/nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).

This commit is contained in:
Chong Yidong 2011-04-26 14:31:04 -04:00
parent 46155cd37f
commit 45cb8994a3
2 changed files with 10 additions and 5 deletions

View File

@ -1,3 +1,7 @@
2011-04-26 Chong Yidong <cyd@stupidchicken.com>
* nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
2011-04-18 Eli Zaretskii <eliz@gnu.org>
* s/ms-w32.h (localtime): Redirect to sys_localtime.

View File

@ -1422,10 +1422,11 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
DEFUN ("ns-read-file-name", Fns_read_file_name, Sns_read_file_name, 1, 4, 0,
doc: /* Use a graphical panel to read a file name, using prompt PROMPT.
Optional arg DIR, if non-nil, supplies a default directory.
Optional arg ISLOAD, if non-nil, means read a file name for saving.
Optional arg MUSTMATCH, if non-nil, means the returned file or
directory must exist.
Optional arg INIT, if non-nil, provides a default file name to use. */)
(prompt, dir, isLoad, init)
Lisp_Object prompt, dir, isLoad, init;
(prompt, dir, mustmatch, init)
Lisp_Object prompt, dir, mustmatch, init;
{
static id fileDelegate = nil;
int ret;
@ -1450,7 +1451,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
if ([dirS characterAtIndex: 0] == '~')
dirS = [dirS stringByExpandingTildeInPath];
panel = NILP (isLoad) ?
panel = NILP (mustmatch) ?
(id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
[panel setTitle: promptS];
@ -1464,7 +1465,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
panelOK = 0;
BLOCK_INPUT;
if (NILP (isLoad))
if (NILP (mustmatch))
{
ret = [panel runModalForDirectory: dirS file: initS];
}