summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge from trunkold-branches/window-pubMartin Rudalics2011-06-069-20/+98
|\
| * * alloc.c (memory_full) [SYSTEM_MALLOC]: Port to MacO).Paul Eggert2011-06-052-6/+17
| * * lisp/comint.el (comint-dynamic-complete-as-filename)Andreas Schwab2011-06-062-2/+10
| * Fixes: debbugs:8806Andreas Schwab2011-06-062-1/+7
| * * src/gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.Andreas Schwab2011-06-062-4/+10
| * * src/xfns.c (x_set_scroll_bar_default_width): Move declarationsAndreas Schwab2011-06-062-1/+7
| * * lisp/net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced in last...Deniz Dogan2011-06-052-2/+7
| * Handle scroll bar width larger than 16 for GTK3.Jan Djärv2011-06-054-2/+30
| * * lisp/net/rcirc.el (rcirc-prompt-for-encryption): New function.Deniz Dogan2011-06-052-9/+17
* | Whitespace changeMartin Rudalics2011-06-061-1/+1
* | Merge from trunkMartin Rudalics2011-06-0575-1172/+2224
|\ \ | |/
| * lisp/textmodes/bibtex.el: new command bibtex-search-entriesRoland Winkler2011-06-053-0/+128
| * lisp/textmodes/bibtex.el: various small bug fixesRoland Winkler2011-06-042-25/+38
| * lisp/textmodes/bibtex.el (bibtex-search-entry-globally): New variableRoland Winkler2011-06-043-4/+24
| * lisp/textmodes/bibtex.el (bibtex-entry-format): new option sort-fieldsRoland Winkler2011-06-043-7/+37
| * lisp/doc-view.el: Silence compiler warning.Juanma Barranquero2011-06-052-2/+8
| * src/xdisp.c (single_display_spec_intangible_p): Remove declaration.Juanma Barranquero2011-06-052-1/+4
| * Doc fixes for timer.el (Bug#8793).Chong Yidong2011-06-042-20/+25
| * * src/xselect.c (x_get_foreign_selection): Reduce scope of x_catch_errors (Bu...Chong Yidong2011-06-042-16/+4
| * Handle errors when saving to clipboard manager (Bug#8779).Chong Yidong2011-06-043-9/+62
| * Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.Glenn Morris2011-06-043-2/+20
| |\
| | * * src/emacs.c (main): Warn when starting a GTK emacs in daemon mode.Dan Nicolaescu2011-06-022-0/+9
| | * * fringe.c (update_window_fringes): Don't update overlay arrow bitmap in the ...YAMAMOTO Mitsuharu2011-06-012-2/+11
| * | * lib/getopt.c: Merge trivial change from gnulib.Paul Eggert2011-06-041-1/+0
| * | Fix mistake in last iswitchb.el bug fix.Deniz Dogan2011-06-041-1/+1
| * | * net/tramp-sh.el (tramp-find-shell): Apply workaround also forMichael Albinus2011-06-042-3/+10
| * | * net/tramp.el (tramp-set-completion-function, tramp-parse-rhosts)Michael Albinus2011-06-045-34/+80
| * | * lisp/shell.el: Require and use pcomplete.Stefan Monnier2011-06-043-1/+14
| * | * lisp/iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of `memq'.Deniz Dogan2011-06-042-4/+8
| * | src/bidi.c (bidi_level_of_next_char): Fix last change.Eli Zaretskii2011-06-042-1/+5
| * | * lisp/url/url-future.el (url-future-test): Fix scope of `saver'.Andreas Schwab2011-06-042-3/+7
| * | Support bidi reordering of text covered by display properties.Eli Zaretskii2011-06-045-318/+649
| |\ \
| | * | Cleanup. Tested in -nw and verified that bug #7616 didn't become worse.Eli Zaretskii2011-06-032-25/+5
| | * | src/xdisp.c (single_display_spec_string): Correct a FIXME comment.Eli Zaretskii2011-05-311-3/+10
| | * | Fix cursor motion across display strings covering reordered text.Eli Zaretskii2011-05-284-77/+43
| | * | Fix cursor motion near overlays covering reordered text.Eli Zaretskii2011-05-282-2/+27
| | * | src/xdisp.c (compute_display_string_pos): Fix bogus parentheses.Eli Zaretskii2011-05-281-1/+1
| | * | Discovery of replacing display properties now uses the same codeEli Zaretskii2011-05-214-180/+300
| | * | Remove kludgey save and restore of IT->position for push_it.Eli Zaretskii2011-05-142-16/+12
| | * | Text covered by `display' overlays is correctly reordered.Eli Zaretskii2011-05-144-11/+76
| | * | Refactoring with bidi_fetch_char tested and debugged.Eli Zaretskii2011-05-143-30/+71
| | * | Started work on reordering display strings. Refactor FETCH_CHAR.Eli Zaretskii2011-05-104-70/+232
| * | | * lisp/subr.el (make-progress-reporter): Add "..." by default.Stefan Monnier2011-06-022-0/+6
| * | | Merge: memory_full, gnutls improvementsPaul Eggert2011-06-029-42/+90
| |\ \ \
| | * | | Merge ChangeLog from trunk better.Paul Eggert2011-06-022-23/+16
| | * | | * alloc.c (allocate_vectorlike): Adjust to memory_full API change.Paul Eggert2011-06-021-1/+1
| | * | | Merge from trunk.Paul Eggert2011-06-0265-752/+1333
| | |\ \ \
| | * | | | Fix ChangeLog entry order.Paul Eggert2011-05-301-12/+10
| | * | | | Merge from trunk.Paul Eggert2011-05-3049-502/+913
| | |\ \ \ \
| | * | | | | Add bug#.Paul Eggert2011-05-302-2/+3
View Lorry Controller Status