branch: elpa/helm
commit 02ee80ee494eb3027cb55a83fa3c95a2abf420af
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Rename *-show-help-echo by *-popup-tip-info
---
helm-core.el | 4 ++--
helm-grep.el | 4 ++--
helm-id-utils.el | 2 +-
helm-utils.el | 54 +++++++++++++++++++++++++++---------------------------
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/helm-core.el b/helm-core.el
index 4598b0226eb..e51ec457f49 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -45,7 +45,7 @@
(declare-function transient--delete-window "ext:transient" ())
(declare-function transient--preserve-window-p "ext:transient"
(&optional nohide))
-(declare-function helm-maybe-show-help-echo "helm-utils")
+(declare-function helm-maybe-show-popup-tip-info "helm-utils")
(defvar helm-marked-buffer-name)
(defvar display-buffer-function)
@@ -5486,7 +5486,7 @@ specified as respectively `helm-cand-num' and
`helm-cur-source'."
(forward-line 1)))
(helm-mark-current-line)
(when helm-popup-tip-mode
- (helm-maybe-show-help-echo))
+ (helm-maybe-show-popup-tip-info))
(helm-follow-execute-persistent-action-maybe))
(select-window (minibuffer-window))
(set-buffer (window-buffer window)))))
diff --git a/helm-grep.el b/helm-grep.el
index 761aaf43913..61f2be615d2 100644
--- a/helm-grep.el
+++ b/helm-grep.el
@@ -670,7 +670,7 @@ Have no effect when grep backend use \"--color=\"."
proc-name
(helm-get-candidate-number)
(- (float-time) start-time))
- (helm-maybe-show-help-echo)
+ (helm-maybe-show-popup-tip-info)
(with-helm-window
(setq mode-line-format
`(" " mode-line-buffer-identification " "
@@ -1685,7 +1685,7 @@ returns if available with current AG version."
proc-name
(helm-get-candidate-number)
(- (float-time) start-time))
- (helm-maybe-show-help-echo)
+ (helm-maybe-show-popup-tip-info)
(with-helm-window
(setq mode-line-format
`(" " mode-line-buffer-identification " "
diff --git a/helm-id-utils.el b/helm-id-utils.el
index ea2597e7c34..e62fe5d7c72 100644
--- a/helm-id-utils.el
+++ b/helm-id-utils.el
@@ -57,7 +57,7 @@ MacPorts to install id-utils, it should be `gid32'."
proc (lambda (process event)
(when (or (string= event "finished\n")
(process-get process 'reach-limit))
- (helm-maybe-show-help-echo)
+ (helm-maybe-show-popup-tip-info)
(with-helm-window
(setq mode-line-format
`(" " mode-line-buffer-identification " "
diff --git a/helm-utils.el b/helm-utils.el
index d2150dbc5d1..8ffdda3fdd3 100644
--- a/helm-utils.el
+++ b/helm-utils.el
@@ -1052,48 +1052,48 @@ Assume regexp is a pcre based regexp."
;;; Popup-info
;;
-(defvar helm--show-help-echo-timer nil)
-(defvar helm--maybe-show-help-echo-overlay nil)
+(defvar helm--show-popup-info-timer nil)
+(defvar helm--maybe-show-popup-info-overlay nil)
(defface helm-tooltip
'((((type tty pc))
:background "yellow" :foreground "black")
(t :background "goldenrod" :foreground "black"))
- "Face used by `helm-tooltip-show'."
+ "Face used by `helm-popup-tip-show'."
:group 'helm-grep-faces)
-(defun helm-cancel-help-echo-timer ()
- (when helm--show-help-echo-timer
- (cancel-timer helm--show-help-echo-timer)
- (setq helm--show-help-echo-timer nil))
- (when helm--maybe-show-help-echo-overlay
- (delete-overlay helm--maybe-show-help-echo-overlay)
- (setq helm--maybe-show-help-echo-overlay nil)))
+(defun helm-cancel-popup-tip-timer ()
+ (when helm--show-popup-info-timer
+ (cancel-timer helm--show-popup-info-timer)
+ (setq helm--show-popup-info-timer nil))
+ (when helm--maybe-show-popup-info-overlay
+ (delete-overlay helm--maybe-show-popup-info-overlay)
+ (setq helm--maybe-show-popup-info-overlay nil)))
-(defun helm-tooltip-show (text pos)
+(defun helm-popup-tip-show (text pos)
"Display TEXT at POS in an overlay."
- (setq helm--maybe-show-help-echo-overlay
+ (setq helm--maybe-show-popup-info-overlay
(make-overlay pos (1+ pos)))
- (overlay-put helm--maybe-show-help-echo-overlay
+ (overlay-put helm--maybe-show-popup-info-overlay
'display
(propertize
(concat text "\n")
'face 'helm-tooltip)))
-(defun helm-maybe-show-help-echo ()
- (when helm--maybe-show-help-echo-overlay
- (delete-overlay helm--maybe-show-help-echo-overlay))
+(defun helm-maybe-show-popup-tip-info ()
+ (when helm--maybe-show-popup-info-overlay
+ (delete-overlay helm--maybe-show-popup-info-overlay))
(let* ((src (helm-get-current-source))
(popup-info-fn (assoc-default 'popup-info src)))
(when (and helm-alive-p
helm-popup-tip-mode
popup-info-fn)
- (unless (timerp helm--show-help-echo-timer)
- (setq helm--show-help-echo-timer
+ (unless (timerp helm--show-popup-info-timer)
+ (setq helm--show-popup-info-timer
(run-with-idle-timer
1 nil
(lambda ()
- (cancel-timer helm--show-help-echo-timer)
- (setq helm--show-help-echo-timer nil)
+ (cancel-timer helm--show-popup-info-timer)
+ (setq helm--show-popup-info-timer nil)
;; We may have an error (wrong-type-argument window-live-p
nil)
;; when switching to help window, the error may occur in the
;; small lap of time where the helm-window is deleted and the
@@ -1105,7 +1105,7 @@ Assume regexp is a pcre based regexp."
(str (and popup-info-fn
(funcall popup-info-fn
(helm-get-selection)))))
(when (and str (not (string= str "")))
- (helm-tooltip-show
+ (helm-popup-tip-show
(concat " " str)
pos)))))))))))))
@@ -1119,12 +1119,12 @@ this source to fetch infos on candidate."
:global t
(if helm-popup-tip-mode
(progn
- (add-hook 'helm-move-selection-after-hook 'helm-maybe-show-help-echo)
- (add-hook 'helm-help-mode-after-hook 'helm-maybe-show-help-echo)
- (add-hook 'helm-cleanup-hook 'helm-cancel-help-echo-timer))
- (remove-hook 'helm-move-selection-after-hook 'helm-maybe-show-help-echo)
- (remove-hook 'helm-help-mode-after-hook 'helm-maybe-show-help-echo)
- (remove-hook 'helm-cleanup-hook 'helm-cancel-help-echo-timer)))
+ (add-hook 'helm-move-selection-after-hook
'helm-maybe-show-popup-tip-info)
+ (add-hook 'helm-help-mode-after-hook 'helm-maybe-show-popup-tip-info)
+ (add-hook 'helm-cleanup-hook 'helm-cancel-popup-tip-timer))
+ (remove-hook 'helm-move-selection-after-hook
'helm-maybe-show-popup-tip-info)
+ (remove-hook 'helm-help-mode-after-hook 'helm-maybe-show-popup-tip-info)
+ (remove-hook 'helm-cleanup-hook 'helm-cancel-popup-tip-timer)))
(defun helm-open-file-with-default-tool (file)
"Open FILE with the default tool on this platform."
