diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-24 02:19:13 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-24 02:20:09 +0200 |
| commit | 098347a9b4e16935fc2c9e08817896019e2f1879 (patch) | |
| tree | 9d09260d096edefc5a98d6a0f5f130b999f1115a /src/dispextern.h | |
| parent | 90d0833f24be04e4b36aabda8cae1681ae768258 (diff) | |
| download | emacs-098347a9b4e16935fc2c9e08817896019e2f1879.tar.gz | |
Clarify intent of FACE_FROM_ID and IMAGE_FROM_ID
* src/dispextern.h (FACE_OPT_FROM_ID): Don’t use FACE_FROM_ID,
since it is intended to be used only when it returns a non-null
pointer, and here the pointer might be null.
(IMAGE_OPT_FROM_ID): Don’t use IMAGE_FROM_ID, for similar reasons.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index d0fc3b24df7..08dcd89709a 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1812,7 +1812,7 @@ struct face_cache bool_bf menu_face_changed_p : 1; }; -/* Return a pointer to the cached face with ID on frame F. */ +/* Return a non-null pointer to the cached face with ID on frame F. */ #define FACE_FROM_ID(F, ID) \ (eassert (UNSIGNED_CMP (ID, <, FRAME_FACE_CACHE (F)->used)), \ @@ -1823,7 +1823,7 @@ struct face_cache #define FACE_OPT_FROM_ID(F, ID) \ (UNSIGNED_CMP (ID, <, FRAME_FACE_CACHE (F)->used) \ - ? FACE_FROM_ID (F, ID) \ + ? FRAME_FACE_CACHE (F)->faces_by_id[ID] \ : NULL) /* True if FACE is suitable for displaying ASCII characters. */ @@ -3093,7 +3093,7 @@ struct image_cache }; -/* A pointer to the image with id ID on frame F. */ +/* A non-null pointer to the image with id ID on frame F. */ #define IMAGE_FROM_ID(F, ID) \ (eassert (UNSIGNED_CMP (ID, <, FRAME_IMAGE_CACHE (F)->used)), \ @@ -3104,7 +3104,7 @@ struct image_cache #define IMAGE_OPT_FROM_ID(F, ID) \ (UNSIGNED_CMP (ID, <, FRAME_IMAGE_CACHE (F)->used) \ - ? IMAGE_FROM_ID (F, ID) \ + ? FRAME_IMAGE_CACHE (F)->images[ID] \ : NULL) /* Size of bucket vector of image caches. Should be prime. */ |