Merge from trunk

diff --cc lisp/ChangeLog
index 235b5fdb69ba8b8b1d1c407dcee8796d84b47993,0c3f09e157bff197453c6d8be3ba9752888fad55..6e24dc95f639204f4ecf6f774e1467773885757a
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,68 -1,7 +1,72 @@@
 +2011-01-12  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * dired.el (dired-display-file, dired-why): Use
 +      display-buffer-other-window with label.
 +      (dired-pop-to-buffer): Remove.
 +      (dired-mark-pop-up): Use display-buffer and quit-restore-window.
 +
 +      * proced.el (proced-send-signal): Use display-buffer and
 +      quit-restore-window.
 +
 +2011-01-11  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * vc/ediff-ptch.el (ediff-show-patch-diagnostics): Use
 +      display-buffer-other-window.
 +
 +      * simple.el (goto-line, compose-mail-other-window): Replace
 +      switch-to-buffer-other-window by pop-to-buffer-other-window.
 +      (pop-global-mark): Use pop-to-buffer-same-window instead of
 +      switch-to-buffer.
 +      (compose-mail-other-frame): Use pop-to-buffer-other-frame
 +      instead of switch-to-buffer-other-frame.
 +      (special-mode-map): Bind "q" to quit-restore-window instead of
 +      quit-window.
 +
 +      * buff-menu.el (Buffer-menu-mode-map): Bind "q" to
 +      quit-restore-window.
 +      (buffer-menu): Call pop-to-buffer-same-window.
 +      (buffer-menu-other-window): Call pop-to-buffer-other-window.
 +      (Buffer-menu-select): Rewrite using display-buffer-same-window
 +      and display-buffer.
 +      (Buffer-menu-1-window, Buffer-menu-mouse-select)
 +      (Buffer-menu-this-window): Call pop-to-buffer-same-window.
 +      (Buffer-menu-other-window): Call pop-to-buffer-other-window.
 +      (Buffer-menu-switch-other-window): Call
 +      display-buffer-same-frame-other-window.
 +      (Buffer-menu-2-window): Add label argument in calls of
 +      display-buffer-same-window and
 +      pop-to-buffer-same-frame-other-window.
 +
 +      * mail/reporter.el (reporter-submit-bug-report): Use
 +      display-buffer-same-frame-other-window.
 +
 +      * progmodes/compile.el (compilation-find-file): Use
 +      display-buffer-same-frame.
 +
 +      * progmodes/inf-lisp.el (switch-to-lisp): Rewrite with new buffer
 +      display method specifiers.
 +
 +      * vc/ediff-ptch.el (ediff-get-patch-buffer): Use
 +      pop-to-buffer-other-window.
 +      (ediff-patch-file-internal): Replace switch-to-buffer by
 +      pop-to-buffer-same-window and switch-to-buffer-other-window by
 +      pop-to-buffer-other-window.
 +
 +      * vc/pcvs.el (cvs-ediff-exit-hook): Call
 +      pop-to-buffer-same-window instead of switch-to-buffer.
 +      (cvs-mode-find-file): Replace switch-to-buffer and
 +      switch-to-buffer-other-window by pop-to-buffer-same-window and
 +      pop-to-buffer-other-window.  Replace call to dired-other-window
 +      by call to display-buffer-other-window.
 +      (cvs-temp-buffer): Call display-buffer-other-window instead of
 +      display-buffer.
 +
 +      * vc/pcvs-util.el (cvs-bury-buffer): Call quit-restore-window.
 +
+ 2011-01-11  Johan Bockgård  <bojohan@gnu.org>
+ 
+       * emacs-lisp/unsafep.el (unsafep): Handle backquoted forms.
+ 
  2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * progmodes/prolog.el: Fix up coding convention and such.

diff --cc lisp/gnus/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge