aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge from trunkJoakim Verona2013-08-173-5/+11
|\
| * * doc/emacs/text.texi (Enriched Justification): Minor fixes.Xue Fuqiao2013-08-173-5/+11
* | merge from trunkJoakim Verona2013-08-172-1/+7
|\ \ | |/
| * Mention interactive call of buffer-disable-undo.Xue Fuqiao2013-08-172-1/+7
* | merge from trunkJoakim Verona2013-08-173-2/+4
|\ \ | |/
| * Another doc fix for `buffer-undo-list'.Xue Fuqiao2013-08-173-2/+4
* | merge from trunkJoakim Verona2013-08-162-33/+13
|\ \ | |/
| * (imagemagick_load_image): Remove the ping_wand codeLars Magne Ingebrigtsen2013-08-162-33/+13
* | merge from trunkJoakim Verona2013-08-164-7/+13
|\ \ | |/
| * * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFsLars Magne Ingebrigtsen2013-08-162-1/+5
| * image.c: Fix debugging code accidentally checked inLars Magne Ingebrigtsen2013-08-161-1/+1
| * (imagemagick_get_animation_cache): Fix a double-free error.Lars Magne Ingebrigtsen2013-08-162-7/+9
* | merge from trunkJoakim Verona2013-08-162-11/+101
|\ \ | |/
| * * image.c: Implement an ImageMagick per-image cache.Lars Magne Ingebrigtsen2013-08-162-11/+101
* | merge from trunkJoakim Verona2013-08-162-2/+4
|\ \ | |/
| * Doc fix for `buffer-undo-list'.Xue Fuqiao2013-08-162-2/+4
* | merge from trunkJoakim Verona2013-08-162-11/+18
|\ \ | |/
| * * net/tramp-cmds.el (top): Don't declare `buffer-name'.Michael Albinus2013-08-162-11/+18
* | merge from trunkJoakim Verona2013-08-162-2/+2
|\ \ | |/
| * Auto-commit of generated files.Glenn Morris2013-08-162-2/+2
* | merge from trunkJoakim Verona2013-08-162-2/+9
|\ \ | |/
| * In mouse-autoselect-window-select do autoselect when mouse pointer is on margin.Martin Rudalics2013-08-162-2/+9
* | merge from trunkJoakim Verona2013-08-163-13/+3
|\ \ | |/
| * Reverse previous change, because kill-{new, append} don't have obvious advant...Xue Fuqiao2013-08-163-13/+3
* | merge from trunkJoakim Verona2013-08-164-2/+16
|\ \ | |/
| * Advertise using `kill-new' and `kill-append' in Lisp programs.Xue Fuqiao2013-08-164-2/+16
* | merge from trunkJoakim Verona2013-08-162-4/+14
|\ \ | |/
| * * net/ange-ftp.el (ange-ftp-skip-msgs): Bump :version.Glenn Morris2013-08-161-0/+1
| * * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV (tiny change)William Parsons2013-08-162-1/+5
| * * lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):Glenn Morris2013-08-162-3/+8
* | merge from trunkJoakim Verona2013-08-163-27/+12
|\ \ | |/
| * * bytecomp.el (byte-compile-make-variable-buffer-local): Tweak warning.Glenn Morris2013-08-152-1/+4
| * Simplify news and mail menu itemsGlenn Morris2013-08-152-26/+8
* | merge from trunkJoakim Verona2013-08-164-10/+111
|\ \ | |/
| * Add functions to change the speed of animated imagesGlenn Morris2013-08-154-10/+111
* | merge from trunkJoakim Verona2013-08-162-0/+3
|\ \ | |/
| * doc/lispref/text.texi(Margins): Add an index.Xue Fuqiao2013-08-162-0/+3
* | merge from trunkJoakim Verona2013-08-1610-27/+27
|\ \ | |/
| * Spelling fixes.Paul Eggert2013-08-1510-27/+27
* | merge from trunkJoakim Verona2013-08-162-5/+5
|\ \ | |/
| * Refine the documentation of `insert-buffer-substring'.Xue Fuqiao2013-08-162-5/+5
* | merge from trunkJoakim Verona2013-08-164-1/+10
|\ \ | |/
| * * src/editfns.c (insert_before_markers): Mention overlay in the doc string.Xue Fuqiao2013-08-162-0/+6
| * * doc/lispref/text.texi (Insertion): Add cross-references.Xue Fuqiao2013-08-162-1/+4
* | merge from trunkJoakim Verona2013-08-167-10/+31
|\ \ | |/
| * Remove documentation of undefined behavior.Xue Fuqiao2013-08-167-10/+31
* | merge from trunkJoakim Verona2013-08-151-1/+2
|\ \ | |/
| * Add comment.Lars Magne Ingebrigtsen2013-08-151-0/+1
| * Whitespace fixup.Lars Magne Ingebrigtsen2013-08-151-1/+1
* | merge from trunkJoakim Verona2013-08-152-13/+15
|\ \ | |/