summaryrefslogtreecommitdiff
path: root/src/dispextern.h
Commit message (Expand)AuthorAgeFilesLines
* Merge from origin/emacs-24Paul Eggert2015-02-251-2/+4
|\
| * src/dispextern.h (FACE_FOR_CHAR): Fix the commentary.Eli Zaretskii2015-01-301-2/+4
| * Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* | Use bool for boolean in xdisp.cPaul Eggert2015-02-091-10/+9
* | Remove no-longer-used two_byte_p calculationsPaul Eggert2015-02-031-3/+0
* | Revert changes installed by xwidgets mergePaul Eggert2015-02-011-27/+0
* | Merge branch 'master' into xwidgetJoakim Verona2015-02-011-2/+2
|\ \
| * | Use bool, not int, to track face changesPaul Eggert2015-01-281-2/+2
* | | Merge branch 'master' into xwidgetJoakim Verona2015-01-271-11/+8
|\ \ \ | |/ /
| * | Use bool for boolean in xfaces.cPaul Eggert2015-01-261-11/+8
* | | merge master, fix conflictsJoakim Verona2015-01-111-16/+12
|\ \ \ | |/ /
| * | Port to 32-bit --with-wide-intPaul Eggert2015-01-101-2/+2
| * | Port to HAVE_FREETYPE && !HAVE_XFTPaul Eggert2015-01-101-2/+2
| * | Fix fallout from "Qnil is zero" change in the display engine. (Bug#19535)Eli Zaretskii2015-01-081-9/+8
| * | Compute C decls for DEFSYMs automaticallyPaul Eggert2015-01-051-5/+2
* | | Removed unused xwidgt pointerjave2015-01-071-1/+0
* | | merge masterjave2015-01-021-1/+1
|\ \ \ | |/ /
| * | Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* | | trailing whitespace, better ifdef of xwidget codejave2009-01-011-10/+10
* | | merge upstreamjave2014-12-311-1/+4
|\ \ \ | |/ /
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-271-1/+4
| |\ \ | | |/
| | * Fix rendering of composed caharacters on the mode line. (Bug#19435)Eli Zaretskii2014-12-251-1/+4
* | | Merge branch 'master' into xwidgetJoakim Verona2014-12-231-32/+53
|\ \ \ | |/ /
| * | * src/: Various fixes to use bool type and constants.Stefan Monnier2014-12-151-5/+5
| * | Reduce memory footprint of struct bidi_it by a factor of 5.Eli Zaretskii2014-12-051-9/+10
| * | Allow to search for characters whose bidi directionality was overridden.Eli Zaretskii2014-12-021-0/+1
| * | Rewrote bracket resolution to match subtleties of Reference Implementation.Eli Zaretskii2014-10-151-1/+2
| * | Merge from trunk and resolve conflicts.Eli Zaretskii2014-10-141-3/+3
| |\ \
| | * | Cleanup terminal handling code.Dmitry Antipov2014-10-141-1/+0
| | * | * dispextern.h, xdisp.c (window_box_right_offset): Now static.Paul Eggert2014-09-231-1/+0
| | * | Merge from emacs-24Stefan Monnier2014-09-221-1/+3
| | |\ \ | | | |/
| | | * src/dispextern.h: Commentary fix.Eli Zaretskii2014-09-151-1/+3
| * | | Increase 'level' in glyph struct; convert bad type aborts into assertions.Eli Zaretskii2014-10-141-2/+2
| * | | Refactored saving prev info, resolve_neutrals, and high-level cache access.Eli Zaretskii2014-10-121-2/+0
| * | | Reset bracket_resolved bit earlier; remove bytepos from bidi_saved_info.Eli Zaretskii2014-10-111-3/+3
| * | | Rename type_after_w1 into type_after_wn.Eli Zaretskii2014-10-111-4/+4
| * | | Fixed crash at startup by starting bidi_bracket_type_t from 1, not zero.Eli Zaretskii2014-10-101-1/+1
| * | | Added BPA. Emacs aborts at startup.Eli Zaretskii2014-10-091-0/+13
| * | | Finished writing code for isolates and fixed a few bugs (no parens yet).Eli Zaretskii2014-09-271-1/+0
| * | | Remove the ignore_bn_limit ``optimization''.Eli Zaretskii2014-09-241-1/+0
| * | | Optimize memory footprint of the bidi level stack.Eli Zaretskii2014-09-061-5/+4
| * | | Updated bidi_resolve_weak. Removed next_en_* members from stack.Eli Zaretskii2014-08-301-2/+0
| * | | Updated pushing and popping the bidi stack, and sos calculations.Eli Zaretskii2014-08-301-2/+11
| * | | Finished coding of explicit directional format characters.Eli Zaretskii2014-08-231-3/+1
| * | | Started working on implementing UBA v6.3.Eli Zaretskii2014-08-231-8/+13
| |/ /
| * | Avoid undefined behavior with signed left shift.Paul Eggert2014-08-031-3/+3
| | |
| \ \
*-. \ \ upstreamJoakim Verona2014-07-311-26/+27
|\ \ \ \ | | |/ /
| | * | Complete pixelwise frame/window resizing, add horizontal scrollbar support.Martin Rudalics2014-07-271-2/+5
| | * | * dispextern.h, xdisp.c (hourglass_shown_p, hourglass_atimer):Paul Eggert2014-07-251-5/+1
| | * | Move hourglass machinery to RIF.Dmitry Antipov2014-07-251-18/+20
| |/ /