From: Martin Rudalics Date: Thu, 28 Oct 2010 10:39:38 +0000 (+0200) Subject: Merge from trunk X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d9e68090a95cb74817a5006fa7e137242b3178c;p=emacs.git Merge from trunk --- 2d9e68090a95cb74817a5006fa7e137242b3178c diff --cc doc/lispref/ChangeLog index 8c91d392317,afd20c3890a..dab5044bfb3 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,11 -1,7 +1,15 @@@ + 2010-10-28 Glenn Morris + + * Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir. + +2010-10-27 Martin Rudalics + + * windows.texi (Displaying Buffers, Switching Buffers): Describe + new buffer display code. + + * frames.texi (Initial Parameters): Fix reference to buffer + display section. + 2010-10-24 Eli Zaretskii * display.texi (Window Systems): Deprecate use of window-system as diff --cc lisp/ChangeLog index e2f0139c55e,922a9e6ee6e..d5f4a60b5e4 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,60 -1,63 +1,116 @@@ + 2010-10-28 Glenn Morris + + * term/ns-win.el (global-map, menu-bar-final-items, menu-bar-help-menu): + Move menu-bar related settings to ../menu-bar.el. + * menu-bar.el (global-map, menu-bar-final-items, menu-bar-help-menu): + Move ns-specific settings here from term/ns-win.el. + + * simple.el (x-selection-owner-p): Remove unused declaration. + + 2010-10-28 Stefan Monnier + + * minibuffer.el (completion-cycling): New var (bug#7266). + (minibuffer-complete, completion--do-completion): + Use completion--flush-all-sorted-completions. + (minibuffer-complete): Only cycle if completion-cycling is set. + (completion--flush-all-sorted-completions): Unset completion-cycling. + (minibuffer-force-complete): Set completion-cycling. + (completion-all-sorted-completions): Move declaration before first use. + + 2010-10-28 Leo + + * iswitchb.el (iswitchb-kill-buffer): Avoid `iswitchb-make-buflist' + which changes the order of matches seen by users (bug#7231). + + 2010-10-28 Jes Bodi Klinke (tiny change) + + * progmodes/compile.el (compilation-mode-font-lock-keywords): + Don't confuse -omega as "-o mega". + +2010-10-27 Martin Rudalics + + * frame.el (pop-up-frame-alist, pop-up-frame-function) + (special-display-frame-alist): Make obsolete. + + * window.el (display-buffer-window-and-buffer) + (window--display-buffer-in-window, window--reuse-window) + (window--pop-up-window, window--pop-up-frame) + (split-window-sensibly, window-sensibly-splittable-p) + (window--raise-window-frame, window--usable-frame): Remove. + (display-buffer-mark-dedicated, display-buffer-function) + (special-display-buffer-names) + (special-display-regexps, special-display-p) + (special-display-function, same-window-buffer-names) + (same-window-regexps, same-window-p, pop-up-frames) + (display-buffer-reuse-frames, pop-up-windows) + (split-height-threshold, split-width-threshold) + (even-window-heights): Make obsolete. + (display-buffer-names, display-buffer-regexps): New options. + (display-buffer-frame, display-buffer-normalize-specifiers-1) + (display-buffer-normalize-specifiers) + (display-buffer-adjust-heights, display-buffer-select-window) + (display-buffer-in-window, display-buffer-in-lru-buffer-window) + (display-buffer-in-lru-window, display-buffer-split-window-1) + (display-buffer-split-window, display-buffer-in-new-window) + (display-buffer-in-new-frame, normalize-buffer-to-display) + (display-buffer-same-window, display-buffer-other-window) + (pop-to-buffer-same-window, pop-to-buffer-other-window) + (pop-to-buffer-other-frame, normalize-buffer-to-switch-to): New + functions. + (display-buffer-locations, display-buffer-default-specifiers) + (display-buffer-other-window-specifiers) + (display-buffer-other-frame-specifiers) + (display-buffer-split-specifiers) + (display-buffer-side-specifiers): New variables/constants. + (display-buffer): Major rewrite. + (pop-to-buffer): Rewrite. Default buffer-or-name argument to + the current buffer. + (switch-to-buffer, switch-to-buffer-other-window) + (switch-to-buffer-other-frame): Rewrite. + + * calendar/calendar.el (calendar-basic-setup): Do not call + split-window-horizontally before popping to buffer. Eventually + the second argument of pop-to-buffer must be set accordingly. + + * dired.el (dired-pop-to-buffer): Adapt to new buffer display + code. + + * info.el (Info-revert-find-node, info, info-other-window) + (Info-find-node, Info-next, Info-prev, Info-up) + (Info-goto-emacs-command-node, Info-speedbar-goto-node): Adapt + to new buffer display code. + + 2010-10-27 Stefan Monnier + + * vc/log-edit.el (log-edit-rewrite-fixes): New var. + (log-edit-author): New dynamic var. + (log-edit-changelog-ours-p, log-edit-insert-changelog-entries): Use it + to return the author if different from committer. + (log-edit-insert-changelog): Use them to add Author: and Fixes headers. + + * play/landmark.el: Adjust commenting convention. + (lm-nil-score): Rename from nil-score. + (Xscore, XXscore, XXXscore, XXXXscore, Oscore, OOscore, OOOscore) + (OOOOscore): Move into a let in lm-score-trans-table. + (lm-winning-threshold, lm-loosing-threshold): Use lm-score-trans-table. + + * electric.el (electric-indent-chars): Autoload. + * progmodes/octave-mod.el (octave-mode): + * progmodes/ruby-mode.el (ruby-mode): Take advantage of it. + (ruby-mode-abbrev-table): Merge initialization and declaration. + 2010-10-27 Glenn Morris + * abbrev.el (abbrev-mode): Remove one of the three definitions of this + variable. + + * server.el (server-host, server-port, server-auth-dir): Autoload risky. + * term/ns-win.el: Restore require of cl when compiling. (menu-bar-final-items): Remove non-existent `windows' menu. + (ns-handle-nxopen): Optionally handle the temp-case. + (ns-handle-nxopentemp): Just call ns-handle-nxopen. + (ns-insert-file, ns-find-file): Use `pop'. 2010-10-26 Glenn Morris