diff options
| author | Eli Zaretskii | 2021-11-24 16:19:25 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2021-11-24 16:19:25 +0200 |
| commit | c8e28813af0ece36a78872c67f419cb0a0bbb6b9 (patch) | |
| tree | 4206e91ba4d76d944c36fbfbb9eba24ae6f715b0 /src | |
| parent | 6e1b984563c3ea2fdc06ec1ea57c13a6f0114c6f (diff) | |
| download | emacs-c8e28813af0ece36a78872c67f419cb0a0bbb6b9.tar.gz emacs-c8e28813af0ece36a78872c67f419cb0a0bbb6b9.zip | |
Minor fixes for a recent commit
* src/xdisp.c (find_display_property): Fix style of comments.
(Fget_display_property): Doc fix.
(get_display_property): Fix style and whitespace.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index cda7e04522c..59509418790 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -5150,7 +5150,7 @@ find_display_property (Lisp_Object disp, Lisp_Object prop) | |||
| 5150 | { | 5150 | { |
| 5151 | if (NILP (disp)) | 5151 | if (NILP (disp)) |
| 5152 | return Qnil; | 5152 | return Qnil; |
| 5153 | /* We have a vector of display specs. */ | 5153 | /* We have a vector of display specs. */ |
| 5154 | if (VECTORP (disp)) | 5154 | if (VECTORP (disp)) |
| 5155 | { | 5155 | { |
| 5156 | for (ptrdiff_t i = 0; i < ASIZE (disp); i++) | 5156 | for (ptrdiff_t i = 0; i < ASIZE (disp); i++) |
| @@ -5163,7 +5163,7 @@ find_display_property (Lisp_Object disp, Lisp_Object prop) | |||
| 5163 | } | 5163 | } |
| 5164 | return Qnil; | 5164 | return Qnil; |
| 5165 | } | 5165 | } |
| 5166 | /* We have a list of display specs. */ | 5166 | /* We have a list of display specs. */ |
| 5167 | else if (CONSP (disp) | 5167 | else if (CONSP (disp) |
| 5168 | && CONSP (XCAR (disp))) | 5168 | && CONSP (XCAR (disp))) |
| 5169 | { | 5169 | { |
| @@ -5176,7 +5176,7 @@ find_display_property (Lisp_Object disp, Lisp_Object prop) | |||
| 5176 | return XCAR (XCDR (elem)); | 5176 | return XCAR (XCDR (elem)); |
| 5177 | 5177 | ||
| 5178 | /* Check that we have a proper list before going to the next | 5178 | /* Check that we have a proper list before going to the next |
| 5179 | element. */ | 5179 | element. */ |
| 5180 | if (CONSP (XCDR (disp))) | 5180 | if (CONSP (XCDR (disp))) |
| 5181 | disp = XCDR (disp); | 5181 | disp = XCDR (disp); |
| 5182 | else | 5182 | else |
| @@ -5184,7 +5184,7 @@ find_display_property (Lisp_Object disp, Lisp_Object prop) | |||
| 5184 | } | 5184 | } |
| 5185 | return Qnil; | 5185 | return Qnil; |
| 5186 | } | 5186 | } |
| 5187 | /* A simple display spec. */ | 5187 | /* A simple display spec. */ |
| 5188 | else if (CONSP (disp) | 5188 | else if (CONSP (disp) |
| 5189 | && CONSP (XCDR (disp)) | 5189 | && CONSP (XCDR (disp)) |
| 5190 | && EQ (XCAR (disp), prop)) | 5190 | && EQ (XCAR (disp), prop)) |
| @@ -5193,11 +5193,11 @@ find_display_property (Lisp_Object disp, Lisp_Object prop) | |||
| 5193 | return Qnil; | 5193 | return Qnil; |
| 5194 | } | 5194 | } |
| 5195 | 5195 | ||
| 5196 | static Lisp_Object get_display_property (ptrdiff_t bufpos, Lisp_Object prop, | 5196 | static |
| 5197 | Lisp_Object object) | 5197 | Lisp_Object get_display_property (ptrdiff_t bufpos, Lisp_Object prop, |
| 5198 | Lisp_Object object) | ||
| 5198 | { | 5199 | { |
| 5199 | return find_display_property (Fget_text_property (make_fixnum (bufpos), | 5200 | return find_display_property (Fget_text_property (make_fixnum (bufpos), |
| 5200 | |||
| 5201 | Qdisplay, object), | 5201 | Qdisplay, object), |
| 5202 | prop); | 5202 | prop); |
| 5203 | } | 5203 | } |
| @@ -5282,12 +5282,12 @@ display_min_width (struct it *it, ptrdiff_t bufpos, | |||
| 5282 | 5282 | ||
| 5283 | DEFUN ("get-display-property", Fget_display_property, | 5283 | DEFUN ("get-display-property", Fget_display_property, |
| 5284 | Sget_display_property, 2, 4, 0, | 5284 | Sget_display_property, 2, 4, 0, |
| 5285 | doc: /* Get the `display' property PROP at POSITION. | 5285 | doc: /* Get the value of the `display' property PROP at POSITION. |
| 5286 | If OBJECT, this should be a buffer or string where the property is | 5286 | If OBJECT, this should be a buffer or string where the property is |
| 5287 | fetched from. This defaults to the current buffer. | 5287 | fetched from. If omitted, OBJECT defaults to the current buffer. |
| 5288 | 5288 | ||
| 5289 | If PROPERTIES, use those properties instead of the properties at | 5289 | If PROPERTIES, look for value of PROP in PROPERTIES instead of the |
| 5290 | POSITION. */) | 5290 | properties at POSITION. */) |
| 5291 | (Lisp_Object position, Lisp_Object prop, Lisp_Object object, | 5291 | (Lisp_Object position, Lisp_Object prop, Lisp_Object object, |
| 5292 | Lisp_Object properties) | 5292 | Lisp_Object properties) |
| 5293 | { | 5293 | { |