[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100235: Allow the default completion
[Emacs-diffs] /srv/bzr/emacs/trunk r100235: Allow the default completion to cycle.
Tue, 11 May 2010 20:39:46 -0400
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-11 20:39:46 -0400
Allow the default completion to cycle.
* minibuffer.el (completion-cycle-threshold): New custom var.
(completion--do-completion): Use it.
(minibuffer-complete): Use cycling if appropriate.
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2010-05-10 02:07:58 +0000
+++ b/etc/NEWS 2010-05-12 00:39:46 +0000
@@ -43,6 +43,8 @@
* Changes in Emacs 24.1
+** Completion can cycle, depending on completion-cycle-threshold.
** auto-mode-case-fold is now enabled by default.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-05-11 22:01:34 +0000
+++ b/lisp/ChangeLog 2010-05-12 00:39:46 +0000
@@ -1,3 +1,9 @@
+2010-05-12 Stefan Monnier <address@hidden>
+ * minibuffer.el (completion-cycle-threshold): New custom var.
+ (completion--do-completion): Use it.
+ (minibuffer-complete): Use cycling if appropriate.
2010-05-11 Juanma Barranquero <address@hidden>
* dirtrack.el (dirtrackp): Remove defcustom; don't make automatically
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2010-05-11 13:24:49 +0000
+++ b/lisp/minibuffer.el 2010-05-12 00:39:46 +0000
@@ -76,6 +76,9 @@
;; the provided string (as is the case in filecache.el), in which
;; case partial-completion (for example) doesn't make any sense
;; and neither does the completions-first-difference highlight.
+;; - indicate how to display the completions in *Completions* (turn
+;; \n into something else, add special boundaries between
+;; completions). E.g. when completing from the kill-ring.
;; - make partial-completion-mode obsolete:
;; - (?) <foo.h> style completion for file names.
@@ -489,6 +492,18 @@
(delete-region (point) (+ (point) (- end beg))))
+(defcustom completion-cycle-threshold nil
+ "Number of completion candidates below which cycling is used.
+Depending on this setting `minibuffer-complete' may use cycling,
+If nil, cycling is never used.
+If t, cycling is always used.
+If an integer, cycling is used as soon as there are fewer completion
+candidates than this number."
+ :type '(choice (const :tag "No cycling" nil)
+ (const :tag "Always cycle" t)
+ (integer :tag "Threshold")))
(defun completion--do-completion (&optional try-completion-function)
"Do the completion and return a summary of what happened.
M = completion was performed, the text was Modified.
@@ -548,14 +563,43 @@
;; It did find a match. Do we match some possibility exactly now?
(let ((exact (test-completion completion
- (if completed
+ ;; Check to see if we want to do cycling. We do it
+ ;; here, after having performed the normal completion,
+ ;; so as to take advantage of the difference between
+ ;; try-completion and all-completions, for things
+ ;; like completion-ignored-extensions.
+ (when (and completion-cycle-threshold
+ ;; Check that the completion didn't make
+ ;; us jump to a different boundary.
+ (or (not completed)
+ (< (car (completion-boundaries
+ (substring completion 0 comp-pos)
+ (setq completion-all-sorted-completions nil)
+ ((and (not (ignore-errors
+ ;; This signal an (intended) error if comps is too
+ ;; short or if completion-cycle-threshold is t.
+ (consp (nthcdr completion-cycle-threshold comps))))
+ ;; More than 1, so there's something to cycle.
+ (consp (cdr comps)))
+ ;; Fewer than completion-cycle-threshold remaining
+ ;; completions: let's cycle.
+ (setq completed t exact t)
+ (setq completion-all-sorted-completions comps)
;; We could also decide to refresh the completions,
;; if they're displayed (and assuming there are
;; completions left).
;; Show the completion table, if requested.
(if (case completion-auto-help
(lazy (eq this-command last-command))
@@ -566,7 +610,7 @@
;; means we've already given a "Next char not unique" message
;; and the user's hit TAB again, so now we give him help.
((eq this-command last-command)
- (if completion-auto-help (minibuffer-completion-help)))))
+ (if completion-auto-help (minibuffer-completion-help))))
(minibuffer--bitset completed t exact))))))))
@@ -580,21 +624,26 @@
;; If the previous command was not this,
;; mark the completion buffer obsolete.
(unless (eq this-command last-command)
+ (setq completion-all-sorted-completions nil)
(setq minibuffer-scroll-window nil))
- (let ((window minibuffer-scroll-window))
;; If there's a fresh completion window with a live buffer,
;; and this command is repeated, scroll that window.
- (if (window-live-p window)
+ ((window-live-p minibuffer-scroll-window)
+ (let ((window minibuffer-scroll-window))
(with-current-buffer (window-buffer window)
(if (pos-visible-in-window-p (point-max) window)
;; If end is in view, scroll up to the beginning.
(set-window-start window (point-min) nil)
;; Else scroll down one screen.
- (case (completion--do-completion)
+ ;; If we're cycling, keep on cycling.
+ (t (case (completion--do-completion)
(#b001 (minibuffer-message "Sole completion")
|[Prev in Thread]
||[Next in Thread]|
- [Emacs-diffs] /srv/bzr/emacs/trunk r100235: Allow the default completion to cycle.,
Stefan Monnier <=