Merge from trunk

diff --cc lisp/ChangeLog
index e1275419f2bed72723e2dc55a4b30b57e90a33e6,bf31d51c2d1208e3177cf68e99fef586e964e8f4..b0c081d18b050c7cca4fa5d142e193c6c4947f66
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,27 -1,9 +1,33 @@@
 +2010-11-16  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-split-window-1)
 +      (display-buffer-split-window): Rewrite so that windows are
 +      always split evenly.
 +
 +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  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/checkdoc.el (checkdoc-syntax-table): Fix last change.
+       (checkdoc-sentencespace-region-engine, checkdoc-this-string-valid)
+       (checkdoc-proper-noun-region-engine): Use with-syntax-table.
+ 
  2010-11-15  Agustín Martín  <agustin.martin@hispalinux.es>
  
        * textmodes/flyspell.el (flyspell-generic-progmode-verify):

diff --cc lisp/gnus/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge