summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sanitize ChangeLog entries for previous merges.Fabián Ezequiel Gallina2014-12-276-12/+8
* Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-2725-288/+698
|\
| * Fix ChangeLog typoFabián Ezequiel Gallina2014-12-271-2/+2
| * Fix composition of characters from Syriac and Arabis scripts.Eli Zaretskii2014-12-272-1/+9
| * python.el: Fix message when sending region.Fabián Ezequiel Gallina2014-12-272-10/+25
| * python.el: Cleanup temp files even with eval errors.Fabián Ezequiel Gallina2014-12-272-17/+22
| * Fix for previous commitFabián Ezequiel Gallina2014-12-271-6/+5
| * python.el: Handle file encoding for shell.Fabián Ezequiel Gallina2014-12-274-25/+385
| * Spelling fixesPaul Eggert2014-12-258-14/+14
| * * automated/tramp-tests.el (tramp-test17-insert-directory): Do notMichael Albinus2014-12-252-1/+11
| * Fix rendering of composed caharacters on the mode line. (Bug#19435)Eli Zaretskii2014-12-254-99/+93
| * Small doc markup fixesGlenn Morris2014-12-243-3/+5
| * * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.Glenn Morris2014-12-242-2/+6
| * ChangeLog fixGlenn Morris2014-12-241-6/+2
| * TUTORIAL.es: Improve style consistencyÁlvar Ibeas2014-12-242-104/+108
| * TUTORIAL.es: spelling fixesÁlvar Ibeas2014-12-242-13/+17
| * Avoid compiler warning.Jan D2014-12-242-4/+6
* | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-270-0/+0
|\ \ | |/
| * 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
* | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-270-0/+0
|\ \ | |/
| * 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-2743-179/+541
|\ \ | |/
| * * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):Michael Albinus2014-12-242-5/+8
| * Improve indexing on the chapter/section/subsection levels.Eli Zaretskii2014-12-2331-0/+272
| * * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.Stefan Monnier2014-12-232-1/+6
| * * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n"Michael Albinus2014-12-233-21/+36
| * * lisp/progmodes/sh-script.el: Don't set global indent-line-functionStefan Monnier2014-12-222-1/+6
| * Fix line numbers on Python shell.Fabián Ezequiel Gallina2014-12-232-30/+21
| * doc/emacs/buffers.texi (Kill Buffer): Improve indexing.Eli Zaretskii2014-12-222-3/+12
| * Keep maximized when going fullscreen.Jan D2014-12-222-5/+8
| * python.el: Fix electric colon behaviorFabián Ezequiel Gallina2014-12-224-6/+56
| * Fix last patch.Michael Albinus2014-12-211-1/+2
| * Fixes: debbugs:18623Michael Albinus2014-12-212-109/+116
* | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-270-0/+0
|\ \ | |/
| * Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24Michael Albinus2014-12-190-0/+0
| |\
* | \ Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-271-0/+7
|\ \ \ | |/ /
| * | * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER.Michael Albinus2014-12-192-13/+26
* | | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-270-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24Michael Albinus2014-12-198-48/+46
| |\ \ | | |/
| | * Fix content decoding in gnus-read-ephemeral-bug-groupAndreas Schwab2014-12-192-21/+27
| | * src/window.c (Fwindow_body_width): Doc fix. (Bug#19395)Eli Zaretskii2014-12-182-1/+8
| | * * lisp/subr.el (redisplay-dont-pause): Mark as obsolete.Stefan Monnier2014-12-185-26/+15
* | | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-2716-49/+178
|\ \ \ | |/ /
| * | * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER.Michael Albinus2014-12-192-13/+26
| |/
| * * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces inMichael Albinus2014-12-174-12/+40
| * * .gitignore: Ignore /conftest*.Paul Eggert2014-12-162-0/+5
| * * lisp/subr.el (sit-for): Tweak docstring.Stefan Monnier2014-12-156-30/+43
| * Fix vc-git-dir-status-files WRT up-to-date vs editedDmitry Gutov2014-12-152-4/+8