X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ab422c4d6899b1442cb6954c1829c1fb656b006c..3bf234fa520ff90db31fae85f306befdadb24532:/lisp/dabbrev.el

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index d1bdd3f52b..0edc416efa 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,6 +1,6 @@
 ;;; dabbrev.el --- dynamic abbreviation package  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2013 Free
+;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2014 Free
 ;; Software Foundation, Inc.
 
 ;; Author: Don Morrison
@@ -285,6 +285,7 @@ A mode setting this variable should make it buffer local."
 If this variable is non-nil, dabbrev will only look in these buffers.
 It will not even look in the current buffer if it is not a member of
 this list."
+  :type '(choice (const nil) (repeat :tag "List of buffers" string))
   :group 'dabbrev)
 
 ;;----------------------------------------------------------------
@@ -457,7 +458,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
 	       (markerp dabbrev--last-abbrev-location)
 	       (marker-position dabbrev--last-abbrev-location)
 	       (or (eq last-command this-command)
-		   (and (window-minibuffer-p (selected-window))
+		   (and (window-minibuffer-p)
 			(= dabbrev--last-abbrev-location
 			   (point)))))
 	  ;; Find a different expansion for the same abbrev as last time.
@@ -793,7 +794,7 @@ of the start of the occurrence."
     ;; In a minibuffer, search the buffer it was activated from,
     ;; first after the minibuffer itself.  Unless we aren't supposed
     ;; to search the current buffer either.
-    (if (and (window-minibuffer-p (selected-window))
+    (if (and (window-minibuffer-p)
 	     (not dabbrev-search-these-buffers-only))
 	(setq list
 	      (cons (dabbrev--minibuffer-origin)