Merge from trunk

diff --cc lisp/ChangeLog
index 2785d5ed3156e0d1f6b573450162b8359aa7cb58,e11149f16893fad2e759864d4a2663320d30aa48..e153fc7da77a1f8f3631119cfe9b123e1f4301cf
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,26 -1,19 +1,42 @@@
 +2011-06-05  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (window-sides-alist): Remove.
 +      (display-buffer): Remove defgroup and all its members.
 +      (display-buffer-normalize-specifiers-1): Mention argument in
 +      doc-string.
 +      (display-buffer-normalize-specifiers-2): New function.
 +      (display-buffer-normalize-specifiers): Call
 +      display-buffer-normalize-specifiers-2.
 +      (display-buffer-alist-set): Take care of unset initial values.
 +      Add entry for display-buffer-mark-dedicated.  Reorder.
 +      (same-window-buffer-names, same-window-regexps)
 +      (special-display-frame-alist, special-display-function)
 +      (special-display-buffer-names, special-display-regexps)
 +      (pop-up-frame-alist, pop-up-frame-function)
 +      (split-window-preferred-function, split-height-threshold)
 +      (split-width-threshold, even-window-heights): Restore Emacs 23
 +      values, doc-strings and customization groups.
 +      (pop-up-frames, pop-up-windows, display-buffer-reuse-frames)
 +      (display-buffer-mark-dedicated): Restore Emacs 23 doc-strings and
 +      customization groups.  Initialize value to 'unset.
 +      (display-buffer-reuse-window): Quote lambda with #'.
 +
+ 2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * comint.el (comint-dynamic-complete-as-filename)
+       (comint-dynamic-complete-filename): Correctly call
+       completion-in-region.
+ 
+ 2011-06-05  Deniz Dogan  <deniz@dogan.se>
+ 
+       * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced
+       in last change.
+ 
+ 2011-06-05  Deniz Dogan  <deniz@dogan.se>
+ 
+       * net/rcirc.el (rcirc-prompt-for-encryption): New function.
+       (rcirc): Use it to prompt for encryption.
+ 
  2011-06-05  Roland Winkler  <winkler@gnu.org>
  
        * textmodes/bibtex.el (bibtex-search-buffer): New variable.

diff --cc src/ChangeLog
Simple merge

diff --cc src/xfns.c
Simple merge