comparison lisp/minibuf.el @ 225:12579d965149 r20-4b11

Import from CVS: tag r20-4b11
author cvs
date Mon, 13 Aug 2007 10:11:40 +0200
parents d44af0c54775
children 0e522484dd2a
comparison
equal deleted inserted replaced
224:4663b37daab6 225:12579d965149
1643 ;; and passed as a symbol because of disgusting kludges in various 1643 ;; and passed as a symbol because of disgusting kludges in various
1644 ;; places which do stuff like (let ((filename-kludge-p (eq minibuffer-completion-table 'read-file-name-internal))) ...) 1644 ;; places which do stuff like (let ((filename-kludge-p (eq minibuffer-completion-table 'read-file-name-internal))) ...)
1645 'read-file-name-internal)) 1645 'read-file-name-internal))
1646 1646
1647 (defun read-directory-name (prompt 1647 (defun read-directory-name (prompt
1648 &optional dir default must-match initial-contents) 1648 &optional dir default must-match initial-contents
1649 history)
1649 "Read directory name, prompting with PROMPT and completing in directory DIR. 1650 "Read directory name, prompting with PROMPT and completing in directory DIR.
1650 This will prompt with a dialog box if appropriate, according to 1651 This will prompt with a dialog box if appropriate, according to
1651 `should-use-dialog-box-p'. 1652 `should-use-dialog-box-p'.
1652 Value is not expanded---you must call `expand-file-name' yourself. 1653 Value is not expanded---you must call `expand-file-name' yourself.
1653 Value is subject to interpreted by substitute-in-file-name however. 1654 Value is subject to interpreted by substitute-in-file-name however.
1658 Fifth arg INITIAL-CONTENTS specifies text to start with. 1659 Fifth arg INITIAL-CONTENTS specifies text to start with.
1659 Sixth arg HISTORY specifies the history list to use. Default is 1660 Sixth arg HISTORY specifies the history list to use. Default is
1660 `file-name-history'. 1661 `file-name-history'.
1661 DIR defaults to current buffer's directory default." 1662 DIR defaults to current buffer's directory default."
1662 (read-file-name-1 1663 (read-file-name-1
1663 'file-name-history 1664 (or history 'file-name-history)
1664 prompt dir (or default default-directory) must-match initial-contents 1665 prompt dir (or default default-directory) must-match initial-contents
1665 'read-directory-name-internal)) 1666 'read-directory-name-internal))
1666 1667
1667 1668
1668 ;; Environment-variable completion hack 1669 ;; Environment-variable completion hack