aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge from trunkJoakim Verona2013-08-142-2/+8
|\
| * * xdisp.c (redisplay_window): If window_end_valid is cleared due toDmitry Antipov2013-08-142-2/+8
* | merge from trunkJoakim Verona2013-08-144-45/+38
|\ \ | |/
| * * xdisp.c (cursor_type_changed): Now static.Paul Eggert2013-08-143-5/+3
| * * image.c (imagemagick_filename_hint): New arg HINT_BUFFER.Paul Eggert2013-08-142-40/+35
* | merge from trunkJoakim Verona2013-08-145-132/+92
|\ \ | |/
| * * xdisp.c (adjust_window_ends): Move duplicated code to new function.Dmitry Antipov2013-08-142-43/+22
| * * window.h (struct window): Convert window_end_pos andDmitry Antipov2013-08-145-113/+94
* | merge from trunkJoakim Verona2013-08-142-5/+11
|\ \ | |/
| * Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit.Dmitry Antipov2013-08-142-5/+11
* | merge from trunkJoakim Verona2013-08-143-116/+142
|\ \ | |/
| * Cleanup window fringes, margins and scroll bars adjustments.Dmitry Antipov2013-08-142-95/+112
| * * window.h (struct window): Convert scroll_bar_widthDmitry Antipov2013-08-143-27/+36
* | merge from trunkJoakim Verona2013-08-132-5/+11
|\ \ | |/
| * * decompress.c: Minor simplifications.Paul Eggert2013-08-132-5/+11
* | merge from trunkJoakim Verona2013-08-133-7/+14
|\ \ | |/
| * Fix OSX 10.4 compiler errors.Jan Djärv2013-08-132-0/+9
| * Rename :content-type to :format in `create-image'Lars Magne Ingebrigtsen2013-08-131-7/+5
* | merge from trunkJoakim Verona2013-08-132-5/+18
|\ \ | |/
| * White-space cleanup.Lars Magne Ingebrigtsen2013-08-131-1/+1
| * * image.c (imagemagick_filename_hint): Check for errors in the alist structure.Lars Magne Ingebrigtsen2013-08-132-5/+18
* | merge from trunkJoakim Verona2013-08-134-4/+18
|\ \ | |/
| * Fix the Windows build broken by 2013-08-13T15:29:25Z!dmantipov@yandex.ru.Eli Zaretskii2013-08-134-4/+18
* | merge from trunkJoakim Verona2013-08-132-0/+49
|\ \ | |/
| * Enable giving hints to ImageMagick via :content-typeLars Magne Ingebrigtsen2013-08-132-0/+49
* | merge from trunkJoakim Verona2013-08-132-0/+7
|\ \ | |/
| * Fail zlib-decompress-region if loading zlib on Windows failed.Eli Zaretskii2013-08-132-0/+7
* | merge from trunkJoakim Verona2013-08-132-2/+6
|\ \ | |/
| * Fix NS compile breakage.Jan Djärv2013-08-132-2/+6
* | merge from trunkJoakim Verona2013-08-138-65/+71
|\ \ | |/
| * * nsterm.h: Fix CGFloat for OSX 10.4.Jan Djärv2013-08-132-15/+22
| * * window.h (WINDOW_FRINGE_EXTENDED_P): New macro.Dmitry Antipov2013-08-137-50/+49
* | merge from trunkJoakim Verona2013-08-132-3/+10
|\ \ | |/
| * * decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.Paul Eggert2013-08-132-3/+10
* | merge from trunkJoakim Verona2013-08-136-102/+76
|\ \ | |/
| * * window.h (struct window): Convert left_margin_cols andDmitry Antipov2013-08-136-102/+76
* | merge from trunkJoakim Verona2013-08-133-0/+8
|\ \ | |/
| * Doc fix for forward-word and backward-word.Xue Fuqiao2013-08-132-0/+2
| * * src/cmds.c (forward_char, backward_char): Mention the optional argument.Xue Fuqiao2013-08-132-0/+6
* | merge from trunkJoakim Verona2013-08-133-41/+50
|\ \ | |/
| * * window.h (struct window): Convert left_fringe_widthDmitry Antipov2013-08-133-41/+50
* | merge from trunkJoakim Verona2013-08-135-12/+9
|\ \ | |/
| * * nsfns.m (x_set_cursor_type):Dmitry Antipov2013-08-135-12/+9
* | merge from trunkJoakim Verona2013-08-132-2/+4
|\ \ | |/
| * * keyboard.c (Fdiscard_input): Do not increment update_mode_lines.Dmitry Antipov2013-08-132-2/+4
* | merge from trunkJoakim Verona2013-08-135-31/+45
|\ \ | |/
| * * font.c (clear_font_cache): New function, stripped from...Dmitry Antipov2013-08-134-30/+39
| * * window.c (Fset_window_start): Compare `w', not `window' becauseDmitry Antipov2013-08-132-1/+6
* | merge from trunkJoakim Verona2013-08-132-0/+8
|\ \ | |/
| * * process.c (deactivate_process): Reset fds to -1.Paul Eggert2013-08-122-0/+8