aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Don't shrink frame when using desktop-save-mode (Bug#19048).“Martin2014-11-223-30/+22
* 'libxml-parse(html|xml)-region': new optional param 'discard-comments'.Ulf Jasper2014-11-212-21/+33
* Spelling fixes.Paul Eggert2014-11-162-2/+2
* Improve time stamp handling, and be more consistent about it.Paul Eggert2014-11-164-100/+320
* Implement an `inhibit-read-only' text propertyLars Magne Ingebrigtsen2014-11-167-9/+44
* Merge from emacs-24Stefan Monnier2014-11-166-13/+60
|\
| * Backport: Fix for 18993.Jan D2014-11-152-0/+20
| * Fix bug #19060 with inaccurate pixel-based scrolling.Eli Zaretskii2014-11-152-4/+19
| * Fix getting frame size wrong when restoring desktop.Jan D2014-11-152-0/+8
| * Fixes: 18757Jan D2014-11-152-1/+4
| * src/window.h (WINDOW_FRAME_LINE_HEIGHT): Fix a typo in a comment.Eli Zaretskii2014-11-151-1/+1
| * Fixes: 19036Jan Djärv2014-11-142-3/+26
* | Redo the fix, the old takes too much CPU.Jan D2014-11-152-11/+32
* | Time-out NS event loopDavid Reitter2014-11-142-11/+17
* | * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1.Paul Eggert2014-11-142-0/+5
* | Attempt to allocate less font entity objects in xfont_list_patternDmitry Antipov2014-11-142-6/+12
* | Avoid undefined behavior in color table hashing.Paul Eggert2014-11-122-2/+13
* | Merge from emacs-24; up to 117698Glenn Morris2014-11-094-12/+29
|\ \ | |/
| * Fix bug #18982 with assertion violations when reverting buffers.Eli Zaretskii2014-11-092-2/+8
| * Fix bug #18995 with compiling w32heap.c with -funroll-loops.Eli Zaretskii2014-11-092-2/+7
| * * nsterm.h (EmacsScroller): judge returns bool.Jan Djärv2014-11-093-10/+19
* | * lisp/help.el (view-lossage): Include the actual commands run.Stefan Monnier2014-11-092-13/+36
* | Clean up merge error.Jan Djärv2014-11-092-1/+10
* | * xgselect.c (xg_select): Don't assume n_gfds is nonnegativePaul Eggert2014-11-082-2/+6
* | * frame.c (Fcan_run_window_configuration_change_hook): Return a value.Paul Eggert2014-11-082-0/+5
* | Merge from emacs-24; up to 117689Glenn Morris2014-11-082-1/+8
|\ \ | |/
| * * nsterm.m (ns_set_vertical_scroll_bar): Don't call bar setPosition: unlessJan Djärv2014-11-082-1/+8
* | Merge from emacs-24; up to 117687Glenn Morris2014-11-086-12/+58
|\ \ | |/
| * Attempt to fix NS hang. Will probably cause merge conflicts.Jan Djärv2014-11-083-4/+20
| * * callproc.c (encode_current_directory): Encode dir at the end.Michael Albinus2014-11-071-2/+3
| * * src/callproc.c (encode_current_directory): Fix thinko in previous.Glenn Morris2014-11-071-1/+1
| * * callproc.c (encode_current_directory): Support handling of fileMichael Albinus2014-11-072-1/+10
| * * src/syntax.c (back_comment): Fix off-by-one error.Alan Mackenzie2014-11-062-1/+5
| * * src/xgselect.c (xg_select): Use g_main_context_acquire.Dima Kogan2014-11-052-3/+19
| * * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_nameMichael Albinus2014-11-052-1/+9
* | Run `window-configuration-change-hook' only after all faces have been realized.Martin Rudalics2014-11-087-19/+64
* | * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at mergeJan Djärv2014-11-082-0/+15
* | * src/keyboard.c: Call gui-set-selection instead of x-set-selection.Stefan Monnier2014-11-073-32/+37
* | Uniquify the 'size' symbol.Paul Eggert2014-11-075-5/+14
* | Improve inhibiting of implied frame resizes.Martin Rudalics2014-11-0714-120/+524
* | Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.orgGlenn Morris2014-11-034-7/+29
|\ \ | |/
| * src/window.c (window_scroll_pixel_based): Fix a typo in a comment.Eli Zaretskii2014-11-031-2/+2
| * Fix minor issues with functions that dump glyph matrices.Eli Zaretskii2014-11-032-3/+17
| * * nsfns.m (ns_set_doc_edited): Check for FRAME_NS.Jan Djärv2014-11-032-2/+10
* | Fix memory leakJan Djärv2014-11-022-0/+5
* | * nsimage.m (ImageList, imageListNext, imageListSetNext:)Jan Djärv2014-11-023-60/+12
* | Fix incorrect assertionAndreas Schwab2014-11-022-1/+6
* | Clean up merge conflict.Jan Djärv2014-11-013-41/+6
* | Merge from emacs-24; up to 117656Glenn Morris2014-11-017-54/+97
|\ \ | |/
| * * macfont.m (macfont_glyph_extents): Turn off syntetic boldJan Djärv2014-10-312-3/+9