diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 4 |
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 @@ | |||
| 1 | 2014-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 | |||
| 1 | 2014-02-12 Dmitry Gutov <dgutov@yandex.ru> | 6 | 2014-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. | |||
| 1085 | A near full screen is `next-screen-context-lines' less than a full screen. | 1085 | A near full screen is `next-screen-context-lines' less than a full screen. |
| 1086 | Negative ARG means scroll downward. | 1086 | Negative ARG means scroll downward. |
| 1087 | If ARG is the atom `-', scroll downward by nearly full screen." | 1087 | If 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. | |||
| 1106 | A near full screen is `next-screen-context-lines' less than a full screen. | 1106 | A near full screen is `next-screen-context-lines' less than a full screen. |
| 1107 | Negative ARG means scroll upward. | 1107 | Negative ARG means scroll upward. |
| 1108 | If ARG is the atom `-', scroll upward by nearly full screen." | 1108 | If 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) |