procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(completion-setup-function):

Browse source 
Only modify the default-directory in *Completions* (bug#3250).
Take partial-completion into account when setting default-directory.
This commit is contained in:
Stefan Monnier 2009-05-11 15:35:44 +00:00
parent 9cb363dbda
commit a9e3ff690b
2 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2009-05-11 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (completion-setup-function):
Only modify the default-directory in *Completions* (bug#3250).
Take partial-completion into account when setting default-directory.
2009-05-10 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/cl-macs.el (lexical-let*): Doc fix (Bug#3178).
@ -16,26 +22,22 @@
2009-05-08 Kenichi Handa <handa@m17n.org>
* international/encoded-kb.el (encoded-kbd-setup-keymap): Fix for
big5.
* international/mule-diag.el (describe-coding-system): Fix for
big5.
* international/encoded-kb.el (encoded-kbd-setup-keymap):
* international/mule-diag.el (describe-coding-system): Fix for big5.
2009-05-07 Martin Rudalics <rudalics@gmx.at>
* window.el (split-window-sensibly): New function.
(split-height-threshold, split-width-threshold): State in
doc-string that these affect split-window-sensibly. Change
customization subtype from number to integer.
doc-string that these affect split-window-sensibly.
Change customization subtype from number to integer.
(window--splittable-p): Rename to window-splittable-p since it's
referred to in doc-string of split-window-sensibly. Update
doc-string.
referred to in doc-string of split-window-sensibly. Update doc-string.
(window--try-to-split-window): Unconditionally call
split-window-preferred-function and move splitting functionality
to split-window-sensibly (Bug#3142).
(split-window-preferred-function): Rewrite doc-string. Don't
allow nil as customization type.
(split-window-preferred-function): Rewrite doc-string.
Don't allow nil as customization type.
2009-05-07 Chong Yidong <cyd@stupidchicken.com>
@ -104,8 +106,8 @@
* progmodes/cc-langs.el (c-constant-kwds): New ObjC keywords
"YES", "NO", "NS_DURING", "NS_HANDLER", "NS_ENDHANDLER".
* progmodes/cc-align.el (c-lineup-ObjC-method-call-colons): New
function.
* progmodes/cc-align.el (c-lineup-ObjC-method-call-colons):
New function.
2009-04-29 Chong Yidong <cyd@stupidchicken.com>
@ -114,8 +116,8 @@
2009-04-29 Ulrich Mueller <ulm@gentoo.org>
* files.el (hack-local-variables-prop-line)
(hack-local-variables, dir-locals-read-from-file): Bind
read-circle to nil before reading.
(hack-local-variables, dir-locals-read-from-file):
Bind read-circle to nil before reading.
2009-04-28 Geert Kloosterman <g.j.kloosterman@gmail.com> (tiny change)

20
lisp/simple.el
View file

@ -5851,20 +5851,22 @@ Called from `temp-buffer-show-hook'."
;; after the text of the completion list buffer is written.
(defun completion-setup-function ()
(let* ((mainbuf (current-buffer))
(mbuf-contents (minibuffer-completion-contents))
common-string-length)
;; When reading a file name in the minibuffer,
;; set default-directory in the minibuffer
;; so it will get copied into the completion list buffer.
(if minibuffer-completing-file-name
(with-current-buffer mainbuf
(setq default-directory
(file-name-directory (expand-file-name mbuf-contents)))))
(base-dir
;; When reading a file name in the minibuffer,
;; try and find the right default-directory to set in the
;; completion list buffer.
;; FIXME: Why do we do that, actually? --Stef
(if minibuffer-completing-file-name
(file-name-as-directory
(expand-file-name
(substring (minibuffer-completion-contents)
0 (or completion-base-size 0)))))))
(with-current-buffer standard-output
(let ((base-size completion-base-size)) ;Read before killing localvars.
(completion-list-mode)
(set (make-local-variable 'completion-base-size) base-size))
(set (make-local-variable 'completion-reference-buffer) mainbuf)
(if base-dir (setq default-directory base-dir))
(unless completion-base-size
;; This shouldn't be needed any more, but further analysis is needed
;; to make sure it's the case.