From: Martin Rudalics Date: Mon, 6 Jun 2011 06:57:59 +0000 (+0200) Subject: Merge from trunk X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fold-branches%2Fwindow-pub;p=emacs.git Merge from trunk --- 1d00388aae9e39ceb8e520b5f227c21fdd219a20 diff --cc lisp/ChangeLog index 2785d5ed315,e11149f1689..e153fc7da77 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,26 -1,19 +1,42 @@@ +2011-06-05 Martin Rudalics + + * 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 + + * comint.el (comint-dynamic-complete-as-filename) + (comint-dynamic-complete-filename): Correctly call + completion-in-region. + + 2011-06-05 Deniz Dogan + + * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced + in last change. + + 2011-06-05 Deniz Dogan + + * net/rcirc.el (rcirc-prompt-for-encryption): New function. + (rcirc): Use it to prompt for encryption. + 2011-06-05 Roland Winkler * textmodes/bibtex.el (bibtex-search-buffer): New variable.