Commit 45cb8994 authored by Chong Yidong's avatar Chong Yidong
Browse files

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

parent 46155cd3
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> 2011-04-18 Eli Zaretskii <eliz@gnu.org>
* s/ms-w32.h (localtime): Redirect to sys_localtime. * s/ms-w32.h (localtime): Redirect to sys_localtime.
......
...@@ -1422,10 +1422,11 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -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, 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. 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 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. */) Optional arg INIT, if non-nil, provides a default file name to use. */)
(prompt, dir, isLoad, init) (prompt, dir, mustmatch, init)
Lisp_Object prompt, dir, isLoad, init; Lisp_Object prompt, dir, mustmatch, init;
{ {
static id fileDelegate = nil; static id fileDelegate = nil;
int ret; int ret;
...@@ -1450,7 +1451,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -1450,7 +1451,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
if ([dirS characterAtIndex: 0] == '~') if ([dirS characterAtIndex: 0] == '~')
dirS = [dirS stringByExpandingTildeInPath]; dirS = [dirS stringByExpandingTildeInPath];
panel = NILP (isLoad) ? panel = NILP (mustmatch) ?
(id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel]; (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
[panel setTitle: promptS]; [panel setTitle: promptS];
...@@ -1464,7 +1465,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -1464,7 +1465,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
panelOK = 0; panelOK = 0;
BLOCK_INPUT; BLOCK_INPUT;
if (NILP (isLoad)) if (NILP (mustmatch))
{ {
ret = [panel runModalForDirectory: dirS file: initS]; ret = [panel runModalForDirectory: dirS file: initS];
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment