Merge from trunk

diff --cc lisp/ChangeLog
index 43dfa195cc688ffe75de160d6012a3955376e681,26c814fcc214f01443f41659fa226db5d2b16abc..f0f60448feb8342433c5368b55f3a24d163097de
--- 1/lisp/ChangeLog
--- 2/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,