* lisp/uniquify.el (uniquify-buffer-name-style): Change default to `post-forward...

[gnu-emacs] / lisp / hippie-exp.el

diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 7d14d780e2ee370f00c6994651869fe61bb4f7c1..ad233b2a5078fd6b53c6aae87d5f3e477e8229d2 100644 (file)
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -296,7 +296,7 @@ undoes the expansion."
                  (message "No further expansions found"))
              (ding))
            (if (and hippie-expand-verbose
-                    (not (window-minibuffer-p (selected-window))))
+                    (not (window-minibuffer-p)))
                (message "Using %s"
                         (nth he-num hippie-expand-try-functions-list)))))
       (if (and (>= he-num 0)
@@ -305,7 +305,7 @@ undoes the expansion."
            (setq he-num -1)
            (he-reset-string)
            (if (and hippie-expand-verbose
-                    (not (window-minibuffer-p (selected-window))))
+                    (not (window-minibuffer-p)))
                (message "Undoing expansions"))))))
 
 ;; Initializes the region to expand (to between BEG and END).
@@ -978,7 +978,7 @@ The argument OLD has to be nil the first call of this function, and t
 for subsequent calls (for further possible expansions of the same
 string).  It returns t if a new expansion is found, nil otherwise."
   (let ((expansion ())
-       (flag (if (frame-visible-p (window-frame (selected-window)))
+       (flag (if (frame-visible-p (window-frame))
                  'visible t)))
     (unless old
       (he-init-string (he-dabbrev-beg) (point))