Fix fontification bugs with constructors and const.

[bpt/emacs.git] / lisp / hippie-exp.el

diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 2f0a6e3..ad233b2 100644 (file)
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -1,6 +1,6 @@
 ;;; hippie-exp.el --- expand text trying various ways to find its expansion
 
-;; Copyright (C) 1992, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Anders Holst <aho@sans.kth.se>
 ;; Last change: 3 March 1998
@@ -199,6 +199,8 @@
 
 (defvar he-search-window ())
 
+;;; Autoloaded for historical reasons (bug#12982)
+;;;###autoload
 (defcustom hippie-expand-try-functions-list
   '(try-complete-file-name-partially
     try-complete-file-name
@@ -294,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)
@@ -303,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).
@@ -976,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))