Browse files

* helm.el (helm-persistent-action-display-buffer): Be sure buffer win…

…dow isn't dedicated.

* helm-command.el (helm-M-x): Don't handle dedicated window from here.
* helm-utils.el: Disable these pesty messages in describe-* functions.
  • Loading branch information...
1 parent f38ff43 commit ea0fed06c1962f24996136f96ccb9db3363778a1 @thierryvolpiatto thierryvolpiatto committed Dec 29, 2012
Showing with 10 additions and 12 deletions.
  1. +1 −6 helm-command.el
  2. +4 −2 helm-utils.el
  3. +5 −4 helm.el
@@ -127,12 +127,7 @@ It is `helm' replacement of regular `M-x' `execute-extended-command'."
(set-window-buffer (get-buffer-window hbuf)
(setq in-help nil))
- ;; Be sure helm-current-buffer
- ;; have not a dedicated window.
- (set-window-dedicated-p
- (get-buffer-window helm-current-buffer) nil)
- (describe-function (intern candidate))
- (message nil)
+ (helm-c-describe-function candidate)
(setq in-help t))
(setq help-cand candidate)))))
(setq command (helm-comp-read
@@ -346,11 +346,13 @@ The match is done with `string-match'."
(defun helm-c-describe-function (func)
"FUNC is symbol or string."
- (describe-function (helm-c-symbolify func)))
+ (describe-function (helm-c-symbolify func))
+ (message nil))
(defun helm-c-describe-variable (var)
"VAR is symbol or string."
- (describe-variable (helm-c-symbolify var)))
+ (describe-variable (helm-c-symbolify var))
+ (message nil))
(defun helm-c-find-function (func)
"FUNC is symbol or string."
@@ -3569,13 +3569,12 @@ See `helm-persistent-action-display-window' for how to use SPLIT-ONEWINDOW."
(setq minibuffer-scroll-window
(helm-persistent-action-display-window split-onewindow))))
-(defun helm-persistent-action-display-buffer (buf &optional not-this-window)
+(defun helm-persistent-action-display-buffer (buf &optional action)
"Make `pop-to-buffer' and `display-buffer' display in the same window.
If `helm-persistent-action-use-special-display' is non-nil and
BUF is to be displayed by `special-display-function', use it.
Otherwise ignores `special-display-buffer-names' and `special-display-regexps'.
-Argument NOT-THIS-WINDOW if present will be used as
-second argument of `display-buffer'."
+Argument ACTION if present will be used as second argument of `display-buffer'."
(let* ((name (buffer-name buf))
display-buffer-function pop-up-windows pop-up-frames
;; Disable `special-display-regexps' and `special-display-buffer-names'
@@ -3595,7 +3594,9 @@ second argument of `display-buffer'."
thereis (string-match (or (car-safe x) x)
- (display-buffer buf not-this-window)))
+ ;; Be sure window of BUF is not dedicated.
+ (set-window-dedicated-p (get-buffer-window buf) nil)
+ (display-buffer buf action)))
;; scroll-other-window(-down)? for persistent-action
(defun helm-other-window-base (command &optional scroll-amount)

0 comments on commit ea0fed0

Please sign in to comment.