Mercurial > emacs
comparison src/cmds.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | dbc0119ac80e |
| children | 3db1493a6f89 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 111 return Fforward_char (n); | 111 return Fforward_char (n); |
| 112 } | 112 } |
| 113 | 113 |
| 114 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", | 114 DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p", |
| 115 doc: /* Move N lines forward (backward if N is negative). | 115 doc: /* Move N lines forward (backward if N is negative). |
| 116 Precisely, if point is on line I, move to the start of line I + N. | 116 Precisely, if point is on line I, move to the start of line I + N |
| 117 \("start of line" in the logical order). | |
| 117 If there isn't room, go as far as possible (no error). | 118 If there isn't room, go as far as possible (no error). |
| 118 Returns the count of lines left to move. If moving forward, | 119 Returns the count of lines left to move. If moving forward, |
| 119 that is N - number of lines moved; if backward, N + number moved. | 120 that is N - number of lines moved; if backward, N + number moved. |
| 120 With positive N, a non-empty line at the end counts as one line | 121 With positive N, a non-empty line at the end counts as one line |
| 121 successfully moved (for the return value). */) | 122 successfully moved (for the return value). */) |
| 155 | 156 |
| 156 return make_number (count <= 0 ? - shortage : shortage); | 157 return make_number (count <= 0 ? - shortage : shortage); |
| 157 } | 158 } |
| 158 | 159 |
| 159 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "^p", | 160 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "^p", |
| 160 doc: /* Move point to beginning of current line. | 161 doc: /* Move point to beginning of current line (in the logical order). |
| 161 With argument N not nil or 1, move forward N - 1 lines first. | 162 With argument N not nil or 1, move forward N - 1 lines first. |
| 162 If point reaches the beginning or end of buffer, it stops there. | 163 If point reaches the beginning or end of buffer, it stops there. |
| 163 | 164 |
| 164 This function constrains point to the current field unless this moves | 165 This function constrains point to the current field unless this moves |
| 165 point to a different line than the original, unconstrained result. | 166 point to a different line than the original, unconstrained result. |
| 179 | 180 |
| 180 return Qnil; | 181 return Qnil; |
| 181 } | 182 } |
| 182 | 183 |
| 183 DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p", | 184 DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p", |
| 184 doc: /* Move point to end of current line. | 185 doc: /* Move point to end of current line (in the logical order). |
| 185 With argument N not nil or 1, move forward N - 1 lines first. | 186 With argument N not nil or 1, move forward N - 1 lines first. |
| 186 If point reaches the beginning or end of buffer, it stops there. | 187 If point reaches the beginning or end of buffer, it stops there. |
| 187 To ignore intangibility, bind `inhibit-point-motion-hooks' to t. | 188 To ignore intangibility, bind `inhibit-point-motion-hooks' to t. |
| 188 | 189 |
| 189 This function constrains point to the current field unless this moves | 190 This function constrains point to the current field unless this moves |
