diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/window.el | |
parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip |
Merge from mainline.
Diffstat (limited to 'lisp/window.el')
-rw-r--r-- | lisp/window.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index 03cc2732a9f..c03b8a18400 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -2039,5 +2039,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) -;; arch-tag: b508dfcc-c353-4c37-89fa-e773fe10cea9 ;;; window.el ends here |