aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/simple.el8
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b65d0b4ee2..99255517a57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * simple.el (line-move): Document utility function used many
4 places in the Emacs sources (bug#14843).
5
3 * dired.el (dired-mode-map): Make :help text more accurate (bug#14893). 6 * dired.el (dired-mode-map): Make :help text more accurate (bug#14893).
4 (dired-prev-marked-file): Doc fix (bug#14855). 7 (dired-prev-marked-file): Doc fix (bug#14855).
5 (dired-up-directory): Doc fix (bug#14848). 8 (dired-up-directory): Doc fix (bug#14848).
diff --git a/lisp/simple.el b/lisp/simple.el
index 124e04fd0c0..497e69f813d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5113,6 +5113,12 @@ The value is a floating-point number."
5113;; a cleaner solution to the problem of making C-n do something 5113;; a cleaner solution to the problem of making C-n do something
5114;; useful given a tall image. 5114;; useful given a tall image.
5115(defun line-move (arg &optional noerror to-end try-vscroll) 5115(defun line-move (arg &optional noerror to-end try-vscroll)
5116 "Move forward ARG lines.
5117If NOERROR, don't signal an error if we can't move ARG lines.
5118TO-END is unused.
5119TRY-VSCROLL controls whether to vscroll tall lines: if either
5120`auto-window-vscroll' or TRY-VSCROLL is nil, this function will
5121not vscroll."
5116 (if noninteractive 5122 (if noninteractive
5117 (forward-line arg) 5123 (forward-line arg)
5118 (unless (and auto-window-vscroll try-vscroll 5124 (unless (and auto-window-vscroll try-vscroll
@@ -5162,6 +5168,8 @@ The value is a floating-point number."
5162;; Arg says how many lines to move. The value is t if we can move the 5168;; Arg says how many lines to move. The value is t if we can move the
5163;; specified number of lines. 5169;; specified number of lines.
5164(defun line-move-visual (arg &optional noerror) 5170(defun line-move-visual (arg &optional noerror)
5171 "Move ARG lines forward.
5172If NOERROR, don't signal an error if we can't move that many lines."
5165 (let ((opoint (point)) 5173 (let ((opoint (point))
5166 (hscroll (window-hscroll)) 5174 (hscroll (window-hscroll))
5167 target-hscroll) 5175 target-hscroll)