[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110593: * lisp/minibuffer.el (minibu
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110593: * lisp/minibuffer.el (minibuffer-force-complete): Make the next completion use |
Date: |
Fri, 19 Oct 2012 14:59:36 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110593
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-19 14:59:36 -0400
message:
* lisp/minibuffer.el (minibuffer-force-complete): Make the next completion use
the same completion-field (address@hidden).
modified:
lisp/ChangeLog
lisp/minibuffer.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-10-19 09:28:50 +0000
+++ b/lisp/ChangeLog 2012-10-19 18:59:36 +0000
@@ -1,3 +1,8 @@
+2012-10-19 Stefan Monnier <address@hidden>
+
+ * minibuffer.el (minibuffer-force-complete): Make the next completion
use
+ the same completion-field (address@hidden).
+
2012-10-19 Martin Rudalics <address@hidden>
* emacs-lisp/debug.el (debug): Record height of debugger window
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2012-10-18 03:30:04 +0000
+++ b/lisp/minibuffer.el 2012-10-19 18:59:36 +0000
@@ -1134,7 +1134,23 @@
;; through the previous possible completions.
(let ((last (last all)))
(setcdr last (cons (car all) (cdr last)))
- (completion--cache-all-sorted-completions (cdr all)))))))
+ (completion--cache-all-sorted-completions (cdr all)))
+ ;; Make sure repeated uses cycle, even though completion--done might
+ ;; have added a space or something that moved us outside of the field.
+ ;; (bug#12221).
+ (let* ((table minibuffer-completion-table)
+ (pred minibuffer-completion-predicate)
+ (extra-prop completion-extra-properties)
+ (cmd
+ (lambda () "Cycle through the possible completions."
+ (interactive)
+ (let ((completion-extra-properties extra-prop))
+ (completion-in-region start (point) table pred)))))
+ (set-temporary-overlay-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map [remap completion-at-point] cmd)
+ (define-key map (vector last-command-event) cmd)
+ map)))))))
(defvar minibuffer-confirm-exit-commands
'(completion-at-point minibuffer-complete
@@ -1557,7 +1573,6 @@
(let* ((exit-fun (plist-get completion-extra-properties :exit-function))
(pre-msg (and exit-fun (current-message))))
(cl-assert (memq finished '(exact sole finished unknown)))
- ;; FIXME: exit-fun should receive `finished' as a parameter.
(when exit-fun
(when (eq finished 'unknown)
(setq finished
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110593: * lisp/minibuffer.el (minibuffer-force-complete): Make the next completion use,
Stefan Monnier <=