aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* upstreamJoakim Verona2012-05-301-28/+30
|\
| * Merge from trunk.Paul Eggert2012-05-251-0/+5
| |\
| * \ Merge from trunk.Paul Eggert2012-04-211-0/+2
| |\ \
| * \ \ Merge from trunk.Paul Eggert2012-04-091-6/+16
| |\ \ \
| * \ \ \ Merge from trunk.Paul Eggert2012-02-241-1/+14
| |\ \ \ \
| * \ \ \ \ Merge from trunk.Paul Eggert2012-02-101-18/+18
| |\ \ \ \ \
| * \ \ \ \ \ Merge from trunk.Paul Eggert2012-01-161-7/+104
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge from trunk.Paul Eggert2012-01-091-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-12-141-7/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-12-101-26/+40
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-11-181-246/+225
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-11-011-14/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-10-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-10-271-20/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-10-161-51/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from trunk.Paul Eggert2011-09-241-12/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):Paul Eggert2011-09-211-27/+29
* | | | | | | | | | | | | | | | | upstream, fix conflictsJoakim Verona2012-05-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge changes from emacs-24 branchChong Yidong2012-04-271-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Avoid assertion violation when scrolling minibuffer windows.Eli Zaretskii2012-04-231-0/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | upstream partial out of memoryJoakim Verona2012-04-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | * src/window.c (save_window_save): Obey window-point-insertion-type.Stefan Monnier2012-04-101-0/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | upstreamJoakim Verona2012-04-101-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix bug #7464 with mouse highlight after "C-x 1".Eli Zaretskii2012-03-311-0/+15
* | | | | | | | | | | | | | | upstreamJoakim Verona2012-03-131-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Rename inhibit_window_configuration_change_hook to inhibit_lisp_code.Chong Yidong2012-03-121-6/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | upstreamJoakim Verona2012-02-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | * window.c: Fix last fix.Chong Yidong2012-02-241-0/+2
| | | | | | | | | | | | | |
| \ \ \ \ \ \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ \ \ \ \ \ upstreamJoakim Verona2012-02-231-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Avoid infloop in next-frame during frame creation.Chong Yidong2012-02-231-1/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | upstreamJoakim Verona2012-02-151-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | * window.c (Fdelete_window_internal): Invalidate the mouse highlight.Chong Yidong2012-02-121-0/+8
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | upstreamJoakim Verona2012-01-231-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Fix handling of persistent window parameters.Martin Rudalics2012-01-191-18/+18
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | | | | | | | | | | |
| \ \ \ \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ \ \ \ upstreamJoakim Verona2012-01-171-7/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Provide persistent window parameters.Martin Rudalics2012-01-161-7/+104
| |/ / / / / / / / / /
* | | | | | | | | | | upstreamJoakim Verona2012-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | upstreamJoakim Verona2011-12-281-8/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix doc-string typo.Martin Rudalics2011-12-131-1/+1
| * | | | | | | | | Fix doc-string of recenter-redisplay.Martin Rudalics2011-12-131-3/+4
| * | | | | | | | | Minor fixes in window handling code and docs.Martin Rudalics2011-12-131-3/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Spelling fixes.Paul Eggert2011-12-041-1/+1
* | | | | | | | | upstream i thinkJoakim Verona2011-12-281-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Spelling fixes.Paul Eggert2011-11-261-2/+2
| * | | | | | | | * src/window.c (Fcoordinates_in_window_p): Accept only live windows.Chong Yidong2011-11-241-1/+2
* | | | | | | | | upstreamJoakim Verona2011-11-221-22/+35
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | More updates to Windows chapter of Lisp manual.Chong Yidong2011-11-211-2/+2
| * | | | | | | | * src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup.Stefan Monnier2011-11-201-1/+1
| * | | | | | | | Remove term "status" with "window combination limits".Martin Rudalics2011-11-201-9/+9