diff options
| author | Dan Nicolaescu | 2013-04-28 09:11:16 -0400 |
|---|---|---|
| committer | Dan Nicolaescu | 2013-04-28 09:11:16 -0400 |
| commit | ad60824ef15e8c4fd4718f92eca8759cabcec035 (patch) | |
| tree | 32c77a947d92a4b13fee0d91bfb663dc697f4fb9 | |
| parent | edbdcec0a296f1cab2ffcced455e9a04c0408509 (diff) | |
| download | emacs-ad60824ef15e8c4fd4718f92eca8759cabcec035.tar.gz emacs-ad60824ef15e8c4fd4718f92eca8759cabcec035.zip | |
* dispextern.h (struct face): Move enum face_underline_type
earlier so that bitfields can be in the same word.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispextern.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 84aa50f7047..5fa2404a243 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-04-28 Dan Nicolaescu <dann@gnu.org> | ||
| 2 | |||
| 3 | * dispextern.h (struct face): Move enum face_underline_type | ||
| 4 | earlier so that bitfields can be in the same word. | ||
| 5 | |||
| 1 | 2013-04-28 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2013-04-28 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * nsfns.m (handlePanelKeys): New function. | 8 | * nsfns.m (handlePanelKeys): New function. |
diff --git a/src/dispextern.h b/src/dispextern.h index 9dc3a57c284..5ce7b19f173 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -1591,13 +1591,13 @@ struct face | |||
| 1591 | shadow colors derived from the background color of the face. */ | 1591 | shadow colors derived from the background color of the face. */ |
| 1592 | enum face_box_type box; | 1592 | enum face_box_type box; |
| 1593 | 1593 | ||
| 1594 | /* Style of underlining. */ | ||
| 1595 | enum face_underline_type underline_type; | ||
| 1596 | |||
| 1594 | /* If `box' above specifies a 3D type, 1 means use box_color for | 1597 | /* If `box' above specifies a 3D type, 1 means use box_color for |
| 1595 | drawing shadows. */ | 1598 | drawing shadows. */ |
| 1596 | unsigned use_box_color_for_shadows_p : 1; | 1599 | unsigned use_box_color_for_shadows_p : 1; |
| 1597 | 1600 | ||
| 1598 | /* Style of underlining. */ | ||
| 1599 | enum face_underline_type underline_type; | ||
| 1600 | |||
| 1601 | /* Non-zero if text in this face should be underlined, overlined, | 1601 | /* Non-zero if text in this face should be underlined, overlined, |
| 1602 | strike-through or have a box drawn around it. */ | 1602 | strike-through or have a box drawn around it. */ |
| 1603 | unsigned underline_p : 1; | 1603 | unsigned underline_p : 1; |