aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-02-12 09:48:41 -0500
committerStefan Monnier2014-02-12 09:48:41 -0500
commit59075dcfa0b4b71da37a2dc0f0c1dfdfdf365d9a (patch)
tree1270f4ec6602854c3177a6c752a6a464e8c45f4b
parenta8cb4247f9023dc1237854ee8f8727c82ec7d8a6 (diff)
downloademacs-59075dcfa0b4b71da37a2dc0f0c1dfdfdf365d9a.tar.gz
emacs-59075dcfa0b4b71da37a2dc0f0c1dfdfdf365d9a.zip
* lisp/emulation/cua-base.el (cua-scroll-up, cua-scroll-down): Mark them as
shift-select commands.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emulation/cua-base.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 997786e567b..b184e9e92e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emulation/cua-base.el (cua-scroll-up, cua-scroll-down): Mark them as
4 shift-select commands.
5
12014-02-12 Dmitry Gutov <dgutov@yandex.ru> 62014-02-12 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * progmodes/js.el (js-indent-line): Don't widen. 8 * progmodes/js.el (js-indent-line): Don't widen.
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 00058652aef..96c9ba1e095 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1085,7 +1085,7 @@ If window cannot be scrolled further, move cursor to bottom line instead.
1085A near full screen is `next-screen-context-lines' less than a full screen. 1085A near full screen is `next-screen-context-lines' less than a full screen.
1086Negative ARG means scroll downward. 1086Negative ARG means scroll downward.
1087If ARG is the atom `-', scroll downward by nearly full screen." 1087If ARG is the atom `-', scroll downward by nearly full screen."
1088 (interactive "P") 1088 (interactive "^P")
1089 (cond 1089 (cond
1090 ((eq arg '-) (cua-scroll-down nil)) 1090 ((eq arg '-) (cua-scroll-down nil))
1091 ((< (prefix-numeric-value arg) 0) 1091 ((< (prefix-numeric-value arg) 0)
@@ -1106,7 +1106,7 @@ If window cannot be scrolled further, move cursor to top line instead.
1106A near full screen is `next-screen-context-lines' less than a full screen. 1106A near full screen is `next-screen-context-lines' less than a full screen.
1107Negative ARG means scroll upward. 1107Negative ARG means scroll upward.
1108If ARG is the atom `-', scroll upward by nearly full screen." 1108If ARG is the atom `-', scroll upward by nearly full screen."
1109 (interactive "P") 1109 (interactive "^P")
1110 (cond 1110 (cond
1111 ((eq arg '-) (cua-scroll-up nil)) 1111 ((eq arg '-) (cua-scroll-up nil))
1112 ((< (prefix-numeric-value arg) 0) 1112 ((< (prefix-numeric-value arg) 0)