aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-04-26 14:31:04 -0400
committerChong Yidong2011-04-26 14:31:04 -0400
commit45cb8994a3e04cfa1ff50f4087998934722ee555 (patch)
tree7c6476f267cbcb73b1813d6fb9ee1c4084c5825d /src
parent46155cd37f6c5432348d646c6e99b61b65c7d705 (diff)
downloademacs-45cb8994a3e04cfa1ff50f4087998934722ee555.tar.gz
emacs-45cb8994a3e04cfa1ff50f4087998934722ee555.zip
* src/nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfns.m11
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index faf9564a835..b6f962f4523 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-04-26 Chong Yidong <cyd@stupidchicken.com>
2
3 * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
4
12011-04-18 Eli Zaretskii <eliz@gnu.org> 52011-04-18 Eli Zaretskii <eliz@gnu.org>
2 6
3 * s/ms-w32.h (localtime): Redirect to sys_localtime. 7 * s/ms-w32.h (localtime): Redirect to sys_localtime.
diff --git a/src/nsfns.m b/src/nsfns.m
index 10ce80dd480..64d3bbfbcd0 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1422,10 +1422,11 @@ DEFUN ("ns-popup-color-panel", Fns_popup_color_panel, Sns_popup_color_panel,
1422DEFUN ("ns-read-file-name", Fns_read_file_name, Sns_read_file_name, 1, 4, 0, 1422DEFUN ("ns-read-file-name", Fns_read_file_name, Sns_read_file_name, 1, 4, 0,
1423 doc: /* Use a graphical panel to read a file name, using prompt PROMPT. 1423 doc: /* Use a graphical panel to read a file name, using prompt PROMPT.
1424Optional arg DIR, if non-nil, supplies a default directory. 1424Optional arg DIR, if non-nil, supplies a default directory.
1425Optional arg ISLOAD, if non-nil, means read a file name for saving. 1425Optional arg MUSTMATCH, if non-nil, means the returned file or
1426directory must exist.
1426Optional arg INIT, if non-nil, provides a default file name to use. */) 1427Optional arg INIT, if non-nil, provides a default file name to use. */)
1427 (prompt, dir, isLoad, init) 1428 (prompt, dir, mustmatch, init)
1428 Lisp_Object prompt, dir, isLoad, init; 1429 Lisp_Object prompt, dir, mustmatch, init;
1429{ 1430{
1430 static id fileDelegate = nil; 1431 static id fileDelegate = nil;
1431 int ret; 1432 int ret;
@@ -1450,7 +1451,7 @@ Optional arg INIT, if non-nil, provides a default file name to use. */)
1450 if ([dirS characterAtIndex: 0] == '~') 1451 if ([dirS characterAtIndex: 0] == '~')
1451 dirS = [dirS stringByExpandingTildeInPath]; 1452 dirS = [dirS stringByExpandingTildeInPath];
1452 1453
1453 panel = NILP (isLoad) ? 1454 panel = NILP (mustmatch) ?
1454 (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel]; 1455 (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
1455 1456
1456 [panel setTitle: promptS]; 1457 [panel setTitle: promptS];
@@ -1464,7 +1465,7 @@ Optional arg INIT, if non-nil, provides a default file name to use. */)
1464 1465
1465 panelOK = 0; 1466 panelOK = 0;
1466 BLOCK_INPUT; 1467 BLOCK_INPUT;
1467 if (NILP (isLoad)) 1468 if (NILP (mustmatch))
1468 { 1469 {
1469 ret = [panel runModalForDirectory: dirS file: initS]; 1470 ret = [panel runModalForDirectory: dirS file: initS];
1470 } 1471 }