diff options
| author | Eli Zaretskii | 2014-05-17 11:58:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-05-17 11:58:17 +0300 |
| commit | 1e046d37a49e235c2461630086a65a09ec6cb792 (patch) | |
| tree | f89e68e0068364c15507dc010cab309841863e38 | |
| parent | f81605024fa7b10783440985e3d458cdbda5a270 (diff) | |
| download | emacs-1e046d37a49e235c2461630086a65a09ec6cb792.tar.gz emacs-1e046d37a49e235c2461630086a65a09ec6cb792.zip | |
Fix bug #17511 with unclear documentation of line-move-ignore-invisible.
lisp/simple.el (line-move-ignore-invisible): Doc fix.
doc/lispref/display.texi (Invisible Text): Clarify the description of
line-move-ignore-invisible.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 18 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 11 |
4 files changed, 31 insertions, 7 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 3a82523df2e..87f2d85cc40 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-05-17 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * display.texi (Invisible Text): Clarify the description of | ||
| 4 | line-move-ignore-invisible. (Bug#17511) | ||
| 5 | |||
| 1 | 2014-05-07 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2014-05-07 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * internals.texi (C Dialect): New section. | 8 | * internals.texi (C Dialect): New section. |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index acbef6b9495..e93f9ab5a4d 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -930,12 +930,14 @@ current value of @code{buffer-invisibility-spec}. | |||
| 930 | 930 | ||
| 931 | @vindex line-move-ignore-invisible | 931 | @vindex line-move-ignore-invisible |
| 932 | Ordinarily, functions that operate on text or move point do not care | 932 | Ordinarily, functions that operate on text or move point do not care |
| 933 | whether the text is invisible. The user-level line motion commands | 933 | whether the text is invisible, they process invisible characters and |
| 934 | ignore invisible newlines if @code{line-move-ignore-invisible} is | 934 | visible characters alike. The user-level line motion commands, |
| 935 | non-@code{nil} (the default), but only because they are explicitly | 935 | such as @code{next-line}, @code{previous-line}, ignore invisible |
| 936 | programmed to do so. | 936 | newlines if @code{line-move-ignore-invisible} is non-@code{nil} (the |
| 937 | 937 | default), i.e., behave like these invisible newlines didn't exist in | |
| 938 | However, if a command ends with point inside or at the boundary of | 938 | the buffer, but only because they are explicitly programmed to do so. |
| 939 | |||
| 940 | If a command ends with point inside or at the boundary of | ||
| 939 | invisible text, the main editing loop relocates point to one of the | 941 | invisible text, the main editing loop relocates point to one of the |
| 940 | two ends of the invisible text. Emacs chooses the direction of | 942 | two ends of the invisible text. Emacs chooses the direction of |
| 941 | relocation so that it is the same as the overall movement direction of | 943 | relocation so that it is the same as the overall movement direction of |
| @@ -952,6 +954,10 @@ command moved point forward into an invisible range, Emacs moves point forward | |||
| 952 | to the first visible character that follows the invisible text and then forward | 954 | to the first visible character that follows the invisible text and then forward |
| 953 | one more character. | 955 | one more character. |
| 954 | 956 | ||
| 957 | These @dfn{adjustments} of point that ended up in the middle of | ||
| 958 | invisible text can be disabled by setting @code{disable-point-adjustment} | ||
| 959 | to a non-@code{nil} value. @xref{Adjusting Point}. | ||
| 960 | |||
| 955 | Incremental search can make invisible overlays visible temporarily | 961 | Incremental search can make invisible overlays visible temporarily |
| 956 | and/or permanently when a match includes invisible text. To enable | 962 | and/or permanently when a match includes invisible text. To enable |
| 957 | this, the overlay should have a non-@code{nil} | 963 | this, the overlay should have a non-@code{nil} |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3907aade58e..fc18c9d77d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-05-17 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (line-move-ignore-invisible): Doc fix. (Bug#17511) | ||
| 4 | |||
| 1 | 2014-05-16 Michael Albinus <michael.albinus@gmx.de> | 5 | 2014-05-16 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/dbus.el (dbus-init-bus, dbus-call-method) | 7 | * net/dbus.el (dbus-init-bus, dbus-call-method) |
diff --git a/lisp/simple.el b/lisp/simple.el index 36d2d0b3a15..1b14250e2fd 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -4978,7 +4978,16 @@ When the `track-eol' feature is doing its job, the value is | |||
| 4978 | `most-positive-fixnum'.") | 4978 | `most-positive-fixnum'.") |
| 4979 | 4979 | ||
| 4980 | (defcustom line-move-ignore-invisible t | 4980 | (defcustom line-move-ignore-invisible t |
| 4981 | "Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines. | 4981 | "Non-nil means commands that move by lines ignore invisible newlines. |
| 4982 | |||
| 4983 | When this option is non-nil, \\[next-line], \\[previous-line], \\[move-end-of-line], and \\[move-beginning-of-line] behave | ||
| 4984 | as if newlines that are invisible didn't exist, and count | ||
| 4985 | only visible newlines. Thus, moving across across 2 newlines | ||
| 4986 | one of which is invisible will be counted as a one-line move. | ||
| 4987 | Also, a non-nil value causes invisible text to be ignored when | ||
| 4988 | counting columns for the purposes of keeping point in the same | ||
| 4989 | column by \\[next-line] and \\[previous-line]. | ||
| 4990 | |||
| 4982 | Outline mode sets this." | 4991 | Outline mode sets this." |
| 4983 | :type 'boolean | 4992 | :type 'boolean |
| 4984 | :group 'editing-basics) | 4993 | :group 'editing-basics) |