aboutsummaryrefslogtreecommitdiffstats
path: root/etc/NEWS
diff options
context:
space:
mode:
authorPaul Eggert2011-10-29 19:23:07 -0700
committerPaul Eggert2011-10-29 19:23:07 -0700
commit1fa2385302f5b2e5bb17c8aad3cb4e320512ca46 (patch)
tree83c74219421f969e7b9c1061e781a6f9018bb47c /etc/NEWS
parent8d0eb4c275581847990b85dbb350caa3df9e653f (diff)
parent2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff)
downloademacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.tar.gz
emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.zip
Merge from trunk.
Diffstat (limited to 'etc/NEWS')
-rw-r--r--etc/NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 4e38838c4d2..bd2f6004d39 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1101,8 +1101,8 @@ selected window, signaling an error otherwise. If nil, another window
1101can be used, e.g. if the selected one is strongly dedicated. 1101can be used, e.g. if the selected one is strongly dedicated.
1102 1102
1103*** `split-window-vertically' and `split-window-horizontally' renamed 1103*** `split-window-vertically' and `split-window-horizontally' renamed
1104to `split-window-above-each-other' and `split-window-side-by-side' 1104to `split-window-below' and `split-window-right' respectively.
1105respectively. The old names are kept as aliases. 1105The old names are kept as aliases.
1106 1106
1107*** Display actions 1107*** Display actions
1108 1108