[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112298: * lisp/minibuffer.el (minibu
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112298: * lisp/minibuffer.el (minibuffer-complete): Don't just scroll |
Date: |
Mon, 15 Apr 2013 15:55:41 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112298
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-04-15 15:55:41 -0400
message:
* lisp/minibuffer.el (minibuffer-complete): Don't just scroll
a *Completions* that's been iconified.
(minibuffer-force-complete): Make sure repetitions do cycle when going
through completion-in-region -> minibuffer-complete.
modified:
lisp/ChangeLog
lisp/minibuffer.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-04-15 16:10:24 +0000
+++ b/lisp/ChangeLog 2013-04-15 19:55:41 +0000
@@ -1,3 +1,10 @@
+2013-04-15 Stefan Monnier <address@hidden>
+
+ * minibuffer.el (minibuffer-complete): Don't just scroll
+ a *Completions* that's been iconified.
+ (minibuffer-force-complete): Make sure repetitions do cycle when going
+ through completion-in-region -> minibuffer-complete.
+
2013-04-15 Alan Mackenzie <address@hidden>
Correct the placement of c-cpp-delimiters when there're #s not at
@@ -5,8 +12,8 @@
* progmodes/cc-langs.el (c-anchored-cpp-prefix): Reformulate and
place a submatch around the #.
- * progmodes/cc-mode.el(c-neutralize-syntax-in-and-mark-CPP): Start
- a search at BOL. Put the c-cpp-delimiter category text propertiy
+ * progmodes/cc-mode.el(c-neutralize-syntax-in-and-mark-CPP):
+ Start a search at BOL. Put the c-cpp-delimiter category text propertiy
on the #, not BOL.
2013-04-15 Stefan Monnier <address@hidden>
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2013-03-27 14:41:06 +0000
+++ b/lisp/minibuffer.el 2013-04-15 19:55:41 +0000
@@ -1043,7 +1043,8 @@
(cond
;; If there's a fresh completion window with a live buffer,
;; and this command is repeated, scroll that window.
- ((window-live-p minibuffer-scroll-window)
+ ((and (window-live-p minibuffer-scroll-window)
+ (eq t (frame-visible-p (window-frame minibuffer-scroll-window))))
(let ((window minibuffer-scroll-window))
(with-current-buffer (window-buffer window)
(if (pos-visible-in-window-p (point-max) window)
@@ -1140,6 +1141,7 @@
"Complete the minibuffer to an exact match.
Repeated uses step through the possible completions."
(interactive)
+ (setq minibuffer-scroll-window nil)
;; FIXME: Need to deal with the extra-size issue here as well.
;; FIXME: ~/src/emacs/t<M-TAB>/lisp/minibuffer.el completes to
;; ~/src/emacs/trunk/ and throws away lisp/minibuffer.el.
@@ -1162,6 +1164,7 @@
(completion--done (buffer-substring-no-properties start (point)) 'sole)
;; Set cycling after modifying the buffer since the flush hook resets it.
(setq completion-cycling t)
+ (setq this-command 'completion-at-point) ;For minibuffer-complete.
;; If completing file names, (car all) may be a directory, so we'd now
;; have a new set of possible completions and might want to reset
;; completion-all-sorted-completions to nil, but we prefer not to,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112298: * lisp/minibuffer.el (minibuffer-complete): Don't just scroll,
Stefan Monnier <=