diff options
| author | Eli Zaretskii | 2013-06-10 07:36:06 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-06-10 07:36:06 +0300 |
| commit | 17dd30979f06dc191061b657f8755ebe0f9bde5c (patch) | |
| tree | 67234f92b2eded5000b27f8961242bd3f3069221 /src | |
| parent | fa4729064fd0569682924dfa4d0621b72426066b (diff) | |
| download | emacs-17dd30979f06dc191061b657f8755ebe0f9bde5c.tar.gz emacs-17dd30979f06dc191061b657f8755ebe0f9bde5c.zip | |
Minor cleanup in last commit in get_it_property.
src/xdisp.c (get_it_property): Use it->window instead of generating
a Lisp object from it->w.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 94c5f76a76d..c6fa70e4d84 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (get_it_property): Use it->window instead of generating | ||
| 4 | a Lisp object from it->w. | ||
| 5 | |||
| 1 | 2013-06-09 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-06-09 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (get_it_property): If it->object is a buffer, pass to | 8 | * xdisp.c (get_it_property): If it->object is a buffer, pass to |
diff --git a/src/xdisp.c b/src/xdisp.c index 5edd4bbbc5f..e1d6b0c9a27 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -18977,7 +18977,7 @@ get_it_property (struct it *it, Lisp_Object prop) | |||
| 18977 | else if (BUFFERP (object)) | 18977 | else if (BUFFERP (object)) |
| 18978 | { | 18978 | { |
| 18979 | position = make_number (IT_CHARPOS (*it)); | 18979 | position = make_number (IT_CHARPOS (*it)); |
| 18980 | XSETWINDOW (object, it->w); | 18980 | object = it->window; |
| 18981 | } | 18981 | } |
| 18982 | else | 18982 | else |
| 18983 | return Qnil; | 18983 | return Qnil; |