Commit 982f4ecb authored by Syohei YOSHIDA's avatar Syohei YOSHIDA

Untabify

parent bb51a53e
...@@ -160,10 +160,10 @@ untouched." ...@@ -160,10 +160,10 @@ untouched."
(setq window (selected-window))) (setq window (selected-window)))
(unless (popup-window-full-width-p window) (unless (popup-window-full-width-p window)
(let ((t-p-w-w (buffer-local-value 'truncate-partial-width-windows (let ((t-p-w-w (buffer-local-value 'truncate-partial-width-windows
(window-buffer window)))) (window-buffer window))))
(if (integerp t-p-w-w) (if (integerp t-p-w-w)
(< (window-width window) t-p-w-w) (< (window-width window) t-p-w-w)
t-p-w-w)))) t-p-w-w))))
(defun popup-current-physical-column () (defun popup-current-physical-column ()
"Return the current physical column." "Return the current physical column."
...@@ -596,7 +596,7 @@ KEYMAP is a keymap that will be put on the popup contents." ...@@ -596,7 +596,7 @@ KEYMAP is a keymap that will be put on the popup contents."
(let (overlay begin w (dangle t) (prefix "") (postfix "")) (let (overlay begin w (dangle t) (prefix "") (postfix ""))
(when around (when around
(popup-vertical-motion column direction)) (popup-vertical-motion column direction))
(setq around t (setq around t
current-column (popup-current-physical-column)) current-column (popup-current-physical-column))
(when (> current-column column) (when (> current-column column)
...@@ -627,8 +627,8 @@ KEYMAP is a keymap that will be put on the popup contents." ...@@ -627,8 +627,8 @@ KEYMAP is a keymap that will be put on the popup contents."
(overlay-put overlay 'postfix postfix) (overlay-put overlay 'postfix postfix)
(overlay-put overlay 'width width) (overlay-put overlay 'width width)
(aset overlays (aset overlays
(if (> direction 0) i (- height i 1)) (if (> direction 0) i (- height i 1))
overlay))) overlay)))
(cl-loop for p from (- 10000 (* depth 1000)) (cl-loop for p from (- 10000 (* depth 1000))
for overlay in (nreverse (append overlays nil)) for overlay in (nreverse (append overlays nil))
do (overlay-put overlay 'priority p)) do (overlay-put overlay 'priority p))
...@@ -1317,7 +1317,7 @@ PROMPT is a prompt string when reading events during event loop." ...@@ -1317,7 +1317,7 @@ PROMPT is a prompt string when reading events during event loop."
(isearch-cursor-color popup-isearch-cursor-color) (isearch-cursor-color popup-isearch-cursor-color)
(isearch-keymap popup-isearch-keymap) (isearch-keymap popup-isearch-keymap)
isearch-callback isearch-callback
initial-index initial-index
&aux menu event) &aux menu event)
"Show a popup menu of LIST at POINT. This function returns a "Show a popup menu of LIST at POINT. This function returns a
value of the selected item. Almost arguments are same as value of the selected item. Almost arguments are same as
...@@ -1382,9 +1382,9 @@ If `INITIAL-INDEX' is non-nil, this is an initial index value for ...@@ -1382,9 +1382,9 @@ If `INITIAL-INDEX' is non-nil, this is an initial index value for
(if cursor (if cursor
(popup-jump menu cursor) (popup-jump menu cursor)
(popup-draw menu)) (popup-draw menu))
(when initial-index (when initial-index
(popup-select menu (popup-select menu
(min (- (length list) 1) initial-index))) (min (- (length list) 1) initial-index)))
(if nowait (if nowait
menu menu
(popup-menu-event-loop menu keymap fallback (popup-menu-event-loop menu keymap fallback
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment