diff options
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 22 | ||||
| -rw-r--r-- | lispref/commands.texi | 7 | ||||
| -rw-r--r-- | lispref/display.texi | 5 | ||||
| -rw-r--r-- | lispref/elisp.texi | 2 | ||||
| -rw-r--r-- | lispref/frames.texi | 1 | ||||
| -rw-r--r-- | lispref/text.texi | 32 |
6 files changed, 45 insertions, 24 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index a9d931d3140..7802c74f054 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,9 +1,31 @@ +2007-06-03 Nick Roberts <nickrob@snap.net.nz> + + * commands.texi (Click Events): Describe width and height when + object is nil. + 2007-05-30 Nick Roberts <nickrob@snap.net.nz> * commands.texi (Click Events): Layout more logically. Describe width and height. (Drag Events, Motion Events): Update to new format for position. +2007-06-02 Richard Stallman <rms@gnu.org> + + * frames.texi (Color Parameters): Add xref to (emacs)Standard Faces. + +2007-06-02 Chong Yidong <cyd@stupidchicken.com> + + * Version 22.1 released. + +2007-06-01 Stefan Monnier <monnier@iro.umontreal.ca> + + * text.texi (Special Properties): Correct meaning of fontified + face. + +2007-05-30 Richard Stallman <rms@gnu.org> + + * text.texi (Special Properties): Add link to Adjusting Point. + 2007-05-12 Richard Stallman <rms@gnu.org> * text.texi (Margins): indent-to-left-margin is not the default. diff --git a/lispref/commands.texi b/lispref/commands.texi index 10f4555e1f0..fabe38f9428 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi @@ -1225,7 +1225,7 @@ input stream. @xref{Key Sequence Input}. @item @var{x}, @var{y} -These are the pixel-denominated coordinates of the click, relative to +These are the pixel coordinates of the click, relative to the top left corner of @var{window}, which is @code{(0 . 0)}. For the mode or header line, @var{y} does not have meaningful data. For the vertical line, @var{x} does not have meaningful data. @@ -1266,13 +1266,14 @@ This is the image object on which the click occurred. It is either an image object as returned by @code{find-image} if click was in an image. @item @var{dx}, @var{dy} -These are the pixel-denominated coordinates of the click, relative to +These are the pixel coordinates of the click, relative to the top left corner of @var{object}, which is @code{(0 . 0)}. If @var{object} is @code{nil}, the coordinates are relative to the top left corner of the character glyph clicked on. @item @var{width}, @var{height} -These are the pixel-denominated width and height of @var{object}. +These are the pixel width and height of @var{object} or, if this is +@code{nil}, those of the character glyph clicked on. @end table @sp 1 diff --git a/lispref/display.texi b/lispref/display.texi index acf927b449f..f644a02c2eb 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -2505,8 +2505,9 @@ makes @code{modeline} an alias for the @code{mode-line} face. @cindex automatic face assignment @cindex faces, automatic choice - This hook is used for automatically assigning faces to text in the -buffer. It is part of the implementation of Font-Lock mode. + This hook is used for automatically assigning facesto text in the +buffer. It is part of the implementation of Jit-Lock mode, used by +Font-Lock. @defvar fontification-functions This variable holds a list of functions that are called by Emacs diff --git a/lispref/elisp.texi b/lispref/elisp.texi index acc963d96fd..accfe05c27d 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.990 +@set EMACSVER 22.1.50 @dircategory Emacs @direntry diff --git a/lispref/frames.texi b/lispref/frames.texi index 527f27385f3..b8a0d4749e2 100644 --- a/lispref/frames.texi +++ b/lispref/frames.texi @@ -706,6 +706,7 @@ results for LCD color displays. These frame parameters are semi-obsolete in that they are automatically equivalent to particular face attributes of particular faces. +@xref{Standard Faces,,, emacs, The Emacs Manual}. @table @code @item font diff --git a/lispref/text.texi b/lispref/text.texi index 8fb155d2109..f05a0cd696a 100644 --- a/lispref/text.texi +++ b/lispref/text.texi @@ -2951,6 +2951,11 @@ meanings. The following sections list a few additional special property names that control filling and property inheritance. All other names have no standard meaning, and you can use them as you like. + Note: the properties @code{composition}, @code{display}, +@code{invisible} and @code{intangible} can also cause point to move to +an acceptable place, after each Emacs command. @xref{Adjusting +Point}. + @table @code @cindex property category of text character @kindex category @r{(text property)} @@ -3019,24 +3024,11 @@ that all text between the character and where the mouse is have the same @item fontified @kindex fontified @r{(text property)} -This property says whether the character has a face assigned to it by font -locking. The display engine tests it to decide whether a buffer -portion needs refontifying before display. @xref{Auto Faces}. It -takes one of three values: - -@table @asis -@item @code{nil} -Font locking is disabled, or the character's @code{face} property, if -any, is invalid. - -@item @code{defer} -This value is only used when ``just in time'' font locking is enabled -and it means that the character's @code{face} property is invalid and -needs deferred fontification. - -@item @code{t} -The character's @code{face} property, or absence of one, is valid. -@end table +This property says whether the text is ready for display. If +@code{nil}, Emacs's redisplay routine calls the functions in +@code{fontification-functions} (@pxref{Auto Faces}) to prepare this +part of the buffer before it is displayed. It is used internally by +the ``just in time'' font locking code. @item display This property activates various features that change the @@ -3138,6 +3130,10 @@ If you try to move point forward into the group, point actually moves to the end of the group. If you try to move point backward into the group, point actually moves to the start of the group. +If consecutive characters have unequal non-@code{nil} +@code{intangible} properties, they belong to separate groups; each +group is separately treated as described above. + When the variable @code{inhibit-point-motion-hooks} is non-@code{nil}, the @code{intangible} property is ignored. |