mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

Accept cons cell HIST arg in ido-read-internal

Browse Source
This commit is contained in:
Leo Liu 2011-09-27 17:28:03 +08:00
parent ed497dd4ec
commit 7690bdea13
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-27 Leo Liu <sdl.web@gmail.com>
* ido.el (ido-read-internal): Accept cons cell HIST arg.
2011-09-25 Michael Albinus <michael.albinus@gmx.de>
* net/dbus.el (dbus-unregister-object): Don't release services for

11
lisp/ido.el
View File

@ -1826,7 +1826,7 @@ This function also adds a hook to the minibuffer."
;; e.g. the file name may be ignored or joined with ido-current-directory, and
;; the relevant function is called (find-file, write-file, etc).
(defun ido-read-internal (item prompt history &optional default require-match initial)
(defun ido-read-internal (item prompt hist &optional default require-match initial)
"Perform the `ido-read-buffer' and `ido-read-file-name' functions.
Return the name of a buffer or file selected.
PROMPT is the prompt to give to the user.
@ -1984,7 +1984,7 @@ If INITIAL is non-nil, it specifies the initial input string."
(read-from-minibuffer (ido-make-prompt item prompt)
(prog1 ido-text-init
(setq ido-text-init nil))
ido-completion-map nil history))))
ido-completion-map nil hist))))
(ido-trace "read-from-minibuffer" ido-final-text)
(if (get-buffer ido-completion-buffer)
(kill-buffer ido-completion-buffer))
@ -2155,7 +2155,12 @@ If INITIAL is non-nil, it specifies the initial input string."
(t
(setq done t))))))
(add-to-history (or history 'minibuffer-history) ido-selected)
(add-to-history (cond
((consp hist)
(or (car hist) 'minibuffer-history))
(hist hist)
(t 'minibuffer-history))
ido-selected)
ido-selected))
(defun ido-edit-input ()