diff options
| author | Richard M. Stallman | 2006-03-13 11:47:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-03-13 11:47:26 +0000 |
| commit | 7cd3712bda1dc2573877f78338ef7d9424c8cc2a (patch) | |
| tree | f4ce796dce4fead65205b8c788543784a0b19a60 | |
| parent | e8f10ddbda866838f77444a2d79efbba6122c918 (diff) | |
| download | emacs-7cd3712bda1dc2573877f78338ef7d9424c8cc2a.tar.gz emacs-7cd3712bda1dc2573877f78338ef7d9424c8cc2a.zip | |
(Invisible Text): The impossible position is
now before the invisible text, not after.
(Defining Images): Clean up last change.
| -rw-r--r-- | lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | lispref/display.texi | 40 |
2 files changed, 27 insertions, 19 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 23e6b78b130..4315d817232 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2006-03-13 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * display.texi (Invisible Text): The impossible position is | ||
| 4 | now before the invisible text, not after. | ||
| 5 | (Defining Images): Clean up last change. | ||
| 6 | |||
| 1 | 2006-03-11 Bill Wohler <wohler@newt.com> | 7 | 2006-03-11 Bill Wohler <wohler@newt.com> |
| 2 | 8 | ||
| 3 | * display.texi (Defining Images): Add image-load-path-for-library. | 9 | * display.texi (Defining Images): Add image-load-path-for-library. |
diff --git a/lispref/display.texi b/lispref/display.texi index cd46be95b05..1c6de3bb2a9 100644 --- a/lispref/display.texi +++ b/lispref/display.texi | |||
| @@ -800,15 +800,15 @@ explicitly ignore invisible newlines if | |||
| 800 | @code{line-move-ignore-invisible} is non-@code{nil} (the default), but | 800 | @code{line-move-ignore-invisible} is non-@code{nil} (the default), but |
| 801 | only because they are explicitly programmed to do so. | 801 | only because they are explicitly programmed to do so. |
| 802 | 802 | ||
| 803 | However, if a command ends with point inside or immediately after | 803 | However, if a command ends with point inside or immediately before |
| 804 | invisible text, the main editing loop moves point further forward or | 804 | invisible text, the main editing loop moves point further forward or |
| 805 | further backward (in the same direction that the command already moved | 805 | further backward (in the same direction that the command already moved |
| 806 | it) until that condition is no longer true. Thus, if the command | 806 | it) until that condition is no longer true. Thus, if the command |
| 807 | moved point back into an invisible range, Emacs moves point back to | 807 | moved point back into an invisible range, Emacs moves point back to |
| 808 | the beginning of that range, following the previous visible character. | 808 | the beginning of that range, and then back one more character. If the |
| 809 | If the command moved point forward into an invisible range, Emacs | 809 | command moved point forward into an invisible range, Emacs moves point |
| 810 | moves point forward past the first visible character that follows the | 810 | forward up to the first visible character that follows the invisible |
| 811 | invisible text. | 811 | text. |
| 812 | 812 | ||
| 813 | Incremental search can make invisible overlays visible temporarily | 813 | Incremental search can make invisible overlays visible temporarily |
| 814 | and/or permanently when a match includes invisible text. To enable | 814 | and/or permanently when a match includes invisible text. To enable |
| @@ -4127,20 +4127,22 @@ should specify the image as follows: | |||
| 4127 | 4127 | ||
| 4128 | @defun image-load-path-for-library library image &optional path no-error | 4128 | @defun image-load-path-for-library library image &optional path no-error |
| 4129 | @tindex image-load-path-for-library | 4129 | @tindex image-load-path-for-library |
| 4130 | Return a suitable search path for images relative to @var{library}. | 4130 | This function returns a suitable search path for images relative to |
| 4131 | 4131 | @var{library}. | |
| 4132 | Images for @var{library} are searched for in @file{../../etc/images} | 4132 | |
| 4133 | and @file{../etc/images} relative to the files in | 4133 | First it searches for the image in a path suitable for @var{library} |
| 4134 | @file{lisp/@var{library}} as well as in @code{image-load-path} and | 4134 | includes @file{../../etc/images} and @file{../etc/images} relative to |
| 4135 | @var{load-path}. | 4135 | the files in @file{lisp/@var{library}}, as well as in |
| 4136 | 4136 | @code{image-load-path} and @code{load-path}. | |
| 4137 | This function returns the value of @code{load-path} augmented with the | 4137 | |
| 4138 | directory containing @var{image}. If @var{path} is given, it is used | 4138 | Then this function returns the value of @code{load-path} augmented |
| 4139 | instead of @code{load-path}. If @code{path} is @code{t}, just return | 4139 | with the directory that really contains @var{image}. If @var{path} is |
| 4140 | the directory that contains @var{image}. | 4140 | given, it is used instead of @code{load-path}. If @var{path} is |
| 4141 | 4141 | @code{t}, then it returns just the directory that contains | |
| 4142 | If @var{no-error} is non-nil, this function returns @code{nil} if a | 4142 | @var{image}. |
| 4143 | suitable path can't be found rather than signaling an error. | 4143 | |
| 4144 | If @var{no-error} is non-@code{nil}, this function returns @code{nil} | ||
| 4145 | if a suitable path can't be found, rather than signaling an error. | ||
| 4144 | 4146 | ||
| 4145 | Here is an example that uses a common idiom to provide compatibility | 4147 | Here is an example that uses a common idiom to provide compatibility |
| 4146 | with versions of Emacs that lack the variable @code{image-load-path}: | 4148 | with versions of Emacs that lack the variable @code{image-load-path}: |