aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* src/macuvs.h.moved showed up, and I removed it.jave2014-12-311-9215/+0
* merge upstreamjave2014-12-3122-1264/+1338
|\
| * Simplify setfattr use by assuming GNU makePaul Eggert2014-12-302-23/+29
| * Update documentation of Temporary Displays.Martin Rudalics2014-12-301-1/+1
| * Fix the MS-Windows build.Eli Zaretskii2014-12-292-0/+8
| * Fix previous patch to match its commit messagePaul Eggert2014-12-291-106/+0
| * system-name's returned value can varyPaul Eggert2014-12-295-22/+41
| * Fix produce_composite_width typoPaul Eggert2014-12-282-1/+7
| * Wrap dll functions more simplyPaul Eggert2014-12-286-890/+940
| * Merge from origin/emacs-24Paul Eggert2014-12-282-17/+65
| |\
| | * Port memory-full checking to GnuTLS 3.3Paul Eggert2014-12-272-15/+41
| * | Fix parse_settings to match internal documentationPaul Eggert2014-12-272-17/+27
| * | Sanitize ChangeLog entries for previous merges.Fabián Ezequiel Gallina2014-12-271-0/+1
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-275-103/+105
| |\ \ | | |/
| | * Fix rendering of composed caharacters on the mode line. (Bug#19435)Eli Zaretskii2014-12-254-99/+93
| | * Avoid compiler warning.Jan D2014-12-242-4/+6
| | * Backport: Memory leak fix and 19133 fix.Jan D2014-12-242-2/+12
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-271-2/+1
| |\ \ | | |/
| | * Fix bad bug number reference, shall be 19427.Jan D2014-12-241-1/+1
| | * Backport: Don't cache images in nsimage.m (Bug#18918).Jan D2014-12-243-60/+12
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-272-7/+7
| |\ \ | | |/
| | * Keep maximized when going fullscreen.Jan D2014-12-222-5/+8
| | * src/window.c (Fwindow_body_width): Doc fix. (Bug#19395)Eli Zaretskii2014-12-182-1/+8
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-273-3/+15
| |\ \ | | |/
| | * * lisp/subr.el (sit-for): Tweak docstring.Stefan Monnier2014-12-152-10/+14
| | * src/gnutls.c (gnutls_init): Fix deprecation warning from GCC.Eli Zaretskii2014-12-132-1/+5
| | * A better fix for bug#19346Eli Zaretskii2014-12-122-18/+17
| | * Always define `gnutls-available-p' even if GnuTLS is not available.Ted Zlatanov2014-12-114-27/+48
| | * Support overflow-newline-into-fringe together with word-wrap (bug#19300)Eli Zaretskii2014-12-102-8/+23
| * | Use bool for boolean in xselect.c, xsettings.cPaul Eggert2014-12-264-83/+102
* | | Merge branch 'master' into xwidgetjave2014-12-2817-126/+132
|\ \ \ | |/ /
| * | MS-Windows followup to stpcpy changes.Eli Zaretskii2014-12-264-18/+26
| * | Use bool for boolean in xsmfns.cPaul Eggert2014-12-253-16/+23
| * | Spelling fixesPaul Eggert2014-12-251-1/+1
| * | Prefer stpcpy to strcatPaul Eggert2014-12-2510-90/+71
| * | ChangeLog fixesGlenn Morris2014-12-241-0/+4
| * | Fixes: debbugs:19396Didier Verna2014-12-232-1/+7
* | | Merge branch 'master' into xwidgetJoakim Verona2014-12-23136-8966/+14971
|\ \ \ | |/ /
| * | Fix setting icon for Gtk+ on non-initial frame.Jan D2014-12-222-2/+6
| * | Remove obsolete references to pre-C99 buildsPaul Eggert2014-12-211-2/+2
| * | Use bool for boolean in xterm.cPaul Eggert2014-12-218-270/+345
| * | Fix typo in charset_ordered_list_tick patchPaul Eggert2014-12-201-1/+1
| * | * composite.h (struct composition.width): Now intPaul Eggert2014-12-202-1/+4
| * | Let charset tick grow past USHRT_MAXPaul Eggert2014-12-204-9/+14
| * | Simplify unexec file mode settingPaul Eggert2014-12-205-64/+15
| * | * buffer.c (syms_of_buffer): Omit unneeded staticpros.Paul Eggert2014-12-192-5/+1
| * | Minor cleanups for Lisp objects and symbolsPaul Eggert2014-12-189-102/+128
| * | * gnutls.c: Include gnutls.h.Paul Eggert2014-12-182-0/+3
| * | * image.c (svg_load): Fix pointer signedness.Paul Eggert2014-12-182-5/+9
| * | Add code for "preserving" window sizes.Martin Rudalics2014-12-183-9/+14