diff options
| author | Xue Fuqiao | 2013-08-16 08:20:56 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-08-16 08:20:56 +0800 |
| commit | 2bede2ed9605c3f872f564cc94208cebbf13ac8f (patch) | |
| tree | c2f1e5714b537ce0b75c1ee22f1ef2cb6c21e173 | |
| parent | 0f8a692622e18520c11ae7ae0c3e51b04b410790 (diff) | |
| download | emacs-2bede2ed9605c3f872f564cc94208cebbf13ac8f.tar.gz emacs-2bede2ed9605c3f872f564cc94208cebbf13ac8f.zip | |
Remove documentation of undefined behavior.
* doc/lispref/positions.texi (Character Motion):
* doc/lispref/markers.texi (Moving Markers):
(Creating Markers): Comment out undefined behavior.
* src/marker.c (set_marker): Remove documentation of undefined behavior.
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/markers.texi | 11 | ||||
| -rw-r--r-- | doc/lispref/positions.texi | 10 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 1 | ||||
| -rw-r--r-- | lisp/follow.el | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/marker.c | 7 |
7 files changed, 31 insertions, 10 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 41e996e697e..038705c2f05 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-16 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * positions.texi (Character Motion): | ||
| 4 | * markers.texi (Moving Markers): | ||
| 5 | (Creating Markers): Comment out undefined behavior. | ||
| 6 | |||
| 1 | 2013-08-15 Xue Fuqiao <xfq.free@gmail.com> | 7 | 2013-08-15 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 8 | ||
| 3 | * markers.texi (The Region): Add/move indexes. | 9 | * markers.texi (The Region): Add/move indexes. |
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 712e5f99b63..3863e2f980a 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi | |||
| @@ -216,11 +216,14 @@ new marker that points to the same place and the same buffer as does | |||
| 216 | The new marker's insertion type is specified by the argument | 216 | The new marker's insertion type is specified by the argument |
| 217 | @var{insertion-type}. @xref{Marker Insertion Types}. | 217 | @var{insertion-type}. @xref{Marker Insertion Types}. |
| 218 | 218 | ||
| 219 | @c This behavior used to be documented until 2013/08. | ||
| 220 | @ignore | ||
| 219 | If passed an integer argument less than 1, @code{copy-marker} returns a | 221 | If passed an integer argument less than 1, @code{copy-marker} returns a |
| 220 | new marker that points to the beginning of the current buffer. If | 222 | new marker that points to the beginning of the current buffer. If |
| 221 | passed an integer argument greater than the length of the buffer, | 223 | passed an integer argument greater than the length of the buffer, |
| 222 | @code{copy-marker} returns a new marker that points to the end of the | 224 | @code{copy-marker} returns a new marker that points to the end of the |
| 223 | buffer. | 225 | buffer. |
| 226 | @end ignore | ||
| 224 | 227 | ||
| 225 | @example | 228 | @example |
| 226 | @group | 229 | @group |
| @@ -351,11 +354,15 @@ This function moves @var{marker} to @var{position} | |||
| 351 | in @var{buffer}. If @var{buffer} is not provided, it defaults to | 354 | in @var{buffer}. If @var{buffer} is not provided, it defaults to |
| 352 | the current buffer. | 355 | the current buffer. |
| 353 | 356 | ||
| 357 | @c This behavior used to be documented until 2013/08. | ||
| 358 | @ignore | ||
| 354 | If @var{position} is less than 1, @code{set-marker} moves @var{marker} | 359 | If @var{position} is less than 1, @code{set-marker} moves @var{marker} |
| 355 | to the beginning of the buffer. If @var{position} is greater than the | 360 | to the beginning of the buffer. If @var{position} is greater than the |
| 356 | size of the buffer (@pxref{Point}), @code{set-marker} moves marker to | 361 | size of the buffer (@pxref{Point}), @code{set-marker} moves marker to |
| 357 | the end of the buffer. If @var{position} is @code{nil} or a marker | 362 | the end of the buffer. |
| 358 | that points nowhere, then @var{marker} is set to point nowhere. | 363 | @end ignore |
| 364 | If @var{position} is @code{nil} or a marker that points nowhere, then | ||
| 365 | @var{marker} is set to point nowhere. | ||
| 359 | 366 | ||
| 360 | The value returned is @var{marker}. | 367 | The value returned is @var{marker}. |
| 361 | 368 | ||
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 8a883061b93..d514cff1a16 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi | |||
| @@ -146,9 +146,13 @@ that. | |||
| 146 | 146 | ||
| 147 | @deffn Command goto-char position | 147 | @deffn Command goto-char position |
| 148 | This function sets point in the current buffer to the value | 148 | This function sets point in the current buffer to the value |
| 149 | @var{position}. If @var{position} is less than 1, it moves point to the | 149 | @var{position}. |
| 150 | beginning of the buffer. If @var{position} is greater than the length | 150 | @c This behavior used to be documented until 2013/08. |
| 151 | of the buffer, it moves point to the end. | 151 | @ignore |
| 152 | If @var{position} is less than 1, it moves point to the beginning of | ||
| 153 | the buffer. If @var{position} is greater than the length of the | ||
| 154 | buffer, it moves point to the end. | ||
| 155 | @end ignore | ||
| 152 | 156 | ||
| 153 | If narrowing is in effect, @var{position} still counts from the | 157 | If narrowing is in effect, @var{position} still counts from the |
| 154 | beginning of the buffer, but point cannot go outside the accessible | 158 | beginning of the buffer, but point cannot go outside the accessible |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 7cace70ad07..5346f8dcf58 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -240,6 +240,7 @@ Major and minor modes can add functions to | |||
| 240 | copied out of the buffer. | 240 | copied out of the buffer. |
| 241 | @end defun | 241 | @end defun |
| 242 | 242 | ||
| 243 | @c FIXME: `filter-buffer-substring-function' should be documented. | ||
| 243 | @defvar filter-buffer-substring-functions | 244 | @defvar filter-buffer-substring-functions |
| 244 | This variable is a wrapper hook (@pxref{Running Hooks}), whose members | 245 | This variable is a wrapper hook (@pxref{Running Hooks}), whose members |
| 245 | should be functions that accept four arguments: @var{fun}, | 246 | should be functions that accept four arguments: @var{fun}, |
diff --git a/lisp/follow.el b/lisp/follow.el index 3fcdf24f4f2..2c9365b2ba6 100644 --- a/lisp/follow.el +++ b/lisp/follow.el | |||
| @@ -1259,6 +1259,8 @@ non-first windows in Follow mode." | |||
| 1259 | 1259 | ||
| 1260 | ;; If the region is visible, make it look good when spanning | 1260 | ;; If the region is visible, make it look good when spanning |
| 1261 | ;; multiple windows. | 1261 | ;; multiple windows. |
| 1262 | |||
| 1263 | ;; FIXME: Why not use `use-region-p' here? | ||
| 1262 | (when (region-active-p) | 1264 | (when (region-active-p) |
| 1263 | (follow-maximize-region | 1265 | (follow-maximize-region |
| 1264 | (selected-window) windows win-start-end))) | 1266 | (selected-window) windows win-start-end))) |
diff --git a/src/ChangeLog b/src/ChangeLog index dd4697298ac..5dc29ff47ab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-16 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * marker.c (set_marker): Remove documentation of undefined behavior. | ||
| 4 | |||
| 1 | 2013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> | 5 | 2013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 6 | ||
| 3 | * image.c (imagemagick_compute_animated_image): Animate correctly | 7 | * image.c (imagemagick_compute_animated_image): Animate correctly |
diff --git a/src/marker.c b/src/marker.c index d25e7104b57..2f91bdf9727 100644 --- a/src/marker.c +++ b/src/marker.c | |||
| @@ -536,11 +536,8 @@ set_marker_internal (Lisp_Object marker, Lisp_Object position, | |||
| 536 | DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, | 536 | DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0, |
| 537 | doc: /* Position MARKER before character number POSITION in BUFFER. | 537 | doc: /* Position MARKER before character number POSITION in BUFFER. |
| 538 | If BUFFER is omitted or nil, it defaults to the current buffer. If | 538 | If BUFFER is omitted or nil, it defaults to the current buffer. If |
| 539 | POSITION is less than 1, MARKER is moved to the beginning of the | 539 | POSITION is nil, makes marker point nowhere so it no longer slows down |
| 540 | buffer. If POSITION is greater than the size of the buffer, marker is | 540 | editing in any buffer. Returns MARKER. */) |
| 541 | moved to the end of the buffer. If POSITION is nil, makes marker | ||
| 542 | point nowhere so it no longer slows down editing in any buffer. | ||
| 543 | Returns MARKER. */) | ||
| 544 | (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer) | 541 | (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer) |
| 545 | { | 542 | { |
| 546 | return set_marker_internal (marker, position, buffer, 0); | 543 | return set_marker_internal (marker, position, buffer, 0); |