From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 15 Nov 2010 16:38:16 +0000 (+0100)
Subject: Merge from trunk
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91f13760ae1d55f09530d02c768589419cc837ce;p=emacs.git

Merge from trunk
---

91f13760ae1d55f09530d02c768589419cc837ce
diff --cc lisp/ChangeLog
index 43dfa195cc6,26c814fcc21..f0f60448feb
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,21 -1,8 +1,26 @@@
 +2010-11-15  Martin Rudalics  <rudalics@gmx.at>
 +
 +	* minibuffer.el (minibuffer-completion-help): Don't mark window
 +	as dedicated, the quit-restore parameter should take care of
 +	deleting the window.
 +	(minibuffer-hide-completions): Use quit-restore-window instead
 +	of bury-buffer.
 +
 +	* window.el (display-buffer-split-window-1): Remove max-size
 +	argument and corresponding code.
 +	(display-buffer-split-window): Remove handling of max-height and
 +	max-width specifiers.  Restore the pre Emacs 24 behavior where a
 +	single-window frame could be split ignoring the min-height
 +	specifier (then split-height-threshold value).  For the
 +	horizontal splitting, side equalling nil case call
 +	display-buffer-split-window-1 with side argument set to 'right
 +	instead of 'below, fixing a bug spotted by Štěpán Němec.
 +
+ 2010-11-15  Agustín Martín  <agustin.martin@hispalinux.es>
+ 
+ 	* textmodes/flyspell.el (flyspell-generic-progmode-verify):
+ 	Make sure to check inside the word (Bug#6761).
+ 
  2010-11-14  Chong Yidong  <cyd@stupidchicken.com>
  
  	* startup.el (command-line): If the cursorColor resource is set,