aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2011-10-25 16:01:16 -0700
committerPaul Eggert2011-10-25 16:01:16 -0700
commitf0ecbca80a004824d74ca9bc8b77cc94b2489b34 (patch)
tree1bce01242894a7840910731adc5b76c99f8e6c89 /etc
parenta14e15687ce2e0a02e27bf85f70b3d9c7dfdf850 (diff)
parent507ea2587e3b868468e83ff6bc8b3303c4097984 (diff)
downloademacs-f0ecbca80a004824d74ca9bc8b77cc94b2489b34.tar.gz
emacs-f0ecbca80a004824d74ca9bc8b77cc94b2489b34.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 24aea694902..d6b0bdb484c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -293,7 +293,7 @@ of buffer at first key-press (instead move to top/bottom of buffer)
293when `scroll-error-top-bottom' is non-nil. 293when `scroll-error-top-bottom' is non-nil.
294+++ 294+++
295*** New variable `scroll-error-top-bottom' (see above). 295*** New variable `scroll-error-top-bottom' (see above).
296 296+++
297*** New scrolling commands `scroll-up-line' and `scroll-down-line' 297*** New scrolling commands `scroll-up-line' and `scroll-down-line'
298scroll a line instead of full screen. 298scroll a line instead of full screen.
299+++ 299+++