HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rudimentary support for vc-pull and vc-merge in Git and Mercurial.
[bpt/emacs.git]
/
lisp
/
window.el
diff --git
a/lisp/window.el
b/lisp/window.el
index
b674b48
..
af5d9a5
100644
(file)
--- a/
lisp/window.el
+++ b/
lisp/window.el
@@
-1,11
+1,11
@@
;;; window.el --- GNU Emacs window commands aside from those written in C
;;; window.el --- GNU Emacs window commands aside from those written in C
-;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985, 1989, 1992-1994, 2000-2011
;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
+;; Package: emacs
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-54,6
+54,7
@@
This macro saves and restores the current buffer, since otherwise
its normal operation could make a different buffer current. The
order of recently selected windows and the buffer list ordering
are not altered by this macro (unless they are altered in BODY)."
its normal operation could make a different buffer current. The
order of recently selected windows and the buffer list ordering
are not altered by this macro (unless they are altered in BODY)."
+ (declare (indent 0) (debug t))
`(let ((save-selected-window-window (selected-window))
;; It is necessary to save all of these, because calling
;; select-window changes frame-selected-window for whatever
`(let ((save-selected-window-window (selected-window))
;; It is necessary to save all of these, because calling
;; select-window changes frame-selected-window for whatever
@@
-160,8
+161,8
@@
counts, `walk-windows' includes the windows in the frame from
which you entered the minibuffer, as well as the minibuffer
window.
which you entered the minibuffer, as well as the minibuffer
window.
-ALL-FRAMES nil or omitted means cycle through all windows on
-
WINDOW's
frame, plus the minibuffer window if specified by the
+ALL-FRAMES nil or omitted means cycle through all windows on
the
+
selected
frame, plus the minibuffer window if specified by the
MINIBUF argument, see above. If the minibuffer counts, cycle
through all windows on all frames that share that minibuffer
too.
MINIBUF argument, see above. If the minibuffer counts, cycle
through all windows on all frames that share that minibuffer
too.
@@
-173,8
+174,8
@@
ALL-FRAMES 0 means cycle through all windows on all visible and
iconified frames.
ALL-FRAMES a frame means cycle through all windows on that frame
only.
iconified frames.
ALL-FRAMES a frame means cycle through all windows on that frame
only.
-Anything else means cycle through all windows on
WINDOW's frame
- and no others.
+Anything else means cycle through all windows on
the selected
+
frame
and no others.
This function changes neither the order of recently selected
windows nor the buffer list."
This function changes neither the order of recently selected
windows nor the buffer list."
@@
-2037,5
+2038,4
@@
Otherwise, consult the value of `truncate-partial-width-windows'
(define-key ctl-x-map "+" 'balance-windows)
(define-key ctl-x-4-map "0" 'kill-buffer-and-window)
(define-key ctl-x-map "+" 'balance-windows)
(define-key ctl-x-4-map "0" 'kill-buffer-and-window)
-;; arch-tag: b508dfcc-c353-4c37-89fa-e773fe10cea9
;;; window.el ends here
;;; window.el ends here