aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-03-13 11:47:26 +0000
committerRichard M. Stallman2006-03-13 11:47:26 +0000
commit7cd3712bda1dc2573877f78338ef7d9424c8cc2a (patch)
treef4ce796dce4fead65205b8c788543784a0b19a60
parente8f10ddbda866838f77444a2d79efbba6122c918 (diff)
downloademacs-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/ChangeLog6
-rw-r--r--lispref/display.texi40
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 @@
12006-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
12006-03-11 Bill Wohler <wohler@newt.com> 72006-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
801only because they are explicitly programmed to do so. 801only 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
804invisible text, the main editing loop moves point further forward or 804invisible text, the main editing loop moves point further forward or
805further backward (in the same direction that the command already moved 805further backward (in the same direction that the command already moved
806it) until that condition is no longer true. Thus, if the command 806it) until that condition is no longer true. Thus, if the command
807moved point back into an invisible range, Emacs moves point back to 807moved point back into an invisible range, Emacs moves point back to
808the beginning of that range, following the previous visible character. 808the beginning of that range, and then back one more character. If the
809If the command moved point forward into an invisible range, Emacs 809command moved point forward into an invisible range, Emacs moves point
810moves point forward past the first visible character that follows the 810forward up to the first visible character that follows the invisible
811invisible text. 811text.
812 812
813 Incremental search can make invisible overlays visible temporarily 813 Incremental search can make invisible overlays visible temporarily
814and/or permanently when a match includes invisible text. To enable 814and/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
4130Return a suitable search path for images relative to @var{library}. 4130This function returns a suitable search path for images relative to
4131 4131@var{library}.
4132Images for @var{library} are searched for in @file{../../etc/images} 4132
4133and @file{../etc/images} relative to the files in 4133First 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 4134includes @file{../../etc/images} and @file{../etc/images} relative to
4135@var{load-path}. 4135the files in @file{lisp/@var{library}}, as well as in
4136 4136@code{image-load-path} and @code{load-path}.
4137This function returns the value of @code{load-path} augmented with the 4137
4138directory containing @var{image}. If @var{path} is given, it is used 4138Then this function returns the value of @code{load-path} augmented
4139instead of @code{load-path}. If @code{path} is @code{t}, just return 4139with the directory that really contains @var{image}. If @var{path} is
4140the directory that contains @var{image}. 4140given, it is used instead of @code{load-path}. If @var{path} is
4141 4141@code{t}, then it returns just the directory that contains
4142If @var{no-error} is non-nil, this function returns @code{nil} if a 4142@var{image}.
4143suitable path can't be found rather than signaling an error. 4143
4144If @var{no-error} is non-@code{nil}, this function returns @code{nil}
4145if a suitable path can't be found, rather than signaling an error.
4144 4146
4145Here is an example that uses a common idiom to provide compatibility 4147Here is an example that uses a common idiom to provide compatibility
4146with versions of Emacs that lack the variable @code{image-load-path}: 4148with versions of Emacs that lack the variable @code{image-load-path}: