]>
git.eshelyaron.com Git - emacs.git/log
Joakim Verona [Mon, 19 Aug 2013 05:21:04 +0000 (07:21 +0200)]
merge from trunk
Katsumi Yamaoka [Mon, 19 Aug 2013 05:10:33 +0000 (05:10 +0000)]
Gnus: Exclude iso-2022-jp-2 and shift_jis from the default value set to mm-coding-system-priorities for Japanese users
Joakim Verona [Mon, 19 Aug 2013 04:36:32 +0000 (06:36 +0200)]
merge from trunk
Dmitry Antipov [Mon, 19 Aug 2013 04:24:19 +0000 (08:24 +0400)]
* image.c (imagemagick_create_cache, imagemagick_get_animation_cache)
(imagemagick_prune_animation_cache): Now static.
Joakim Verona [Sun, 18 Aug 2013 23:26:26 +0000 (01:26 +0200)]
merge from trunk
Xue Fuqiao [Sun, 18 Aug 2013 23:12:32 +0000 (07:12 +0800)]
Minor improving in indexing of buffer position.
* doc/lispref/positions.texi (Positions): Improve indexing.
Joakim Verona [Sun, 18 Aug 2013 19:31:48 +0000 (21:31 +0200)]
merge from trunk
Eli Zaretskii [Sun, 18 Aug 2013 19:25:15 +0000 (22:25 +0300)]
Minor improving in indexing of "region".
doc/lispref/markers.texi (The Region): Improve indexing.
Lars Magne Ingebrigtsen [Sun, 18 Aug 2013 19:18:43 +0000 (21:18 +0200)]
* image.c (imagemagick_get_animation_cache): Don't segfault when
pruning all entries.
Joakim Verona [Sun, 18 Aug 2013 17:52:01 +0000 (19:52 +0200)]
merge from trunk
Ken Brown [Sun, 18 Aug 2013 17:37:31 +0000 (13:37 -0400)]
Change size of static heap on Cygwin; report maximum usage after dumping.
* src/sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger
static heap if ENABLE_CHECKING is defined.
(max_bss_sbrk_ptr): New variable.
(bss_sbrk): Use it.
(report_sheap_usage): Report maximum static heap usage instead of
ending static heap usage.
Joakim Verona [Sat, 17 Aug 2013 17:31:47 +0000 (19:31 +0200)]
merge from trunk
Eli Zaretskii [Sat, 17 Aug 2013 17:18:07 +0000 (20:18 +0300)]
Fix a minor issue with loading zlib DLL on MS-Windows.
src/decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value
of zlib_initialized according to the results of calling
init_zlib_functions.
Xue Fuqiao [Sat, 17 Aug 2013 14:14:41 +0000 (22:14 +0800)]
* text.texi (Case Changes): Fix an `args-out-of-range' error in the example.
Joakim Verona [Sat, 17 Aug 2013 11:26:52 +0000 (13:26 +0200)]
merge from trunk
Xue Fuqiao [Sat, 17 Aug 2013 11:14:10 +0000 (19:14 +0800)]
* doc/lispref/modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes.
Joakim Verona [Sat, 17 Aug 2013 11:01:45 +0000 (13:01 +0200)]
merge from trunk
Xue Fuqiao [Sat, 17 Aug 2013 10:46:11 +0000 (18:46 +0800)]
* doc/emacs/text.texi (Columns): Comment out undefined behavior.
Joakim Verona [Sat, 17 Aug 2013 10:31:59 +0000 (12:31 +0200)]
merge from trunk
Michael Albinus [Sat, 17 Aug 2013 10:20:15 +0000 (12:20 +0200)]
* net/tramp.el:
* net/tramp-adb.el:
* net/tramp-cmds.el:
* net/tramp-ftp.el:
* net/tramp-gvfs.el:
* net/tramp-gw.el:
* net/tramp-sh.el: Don't wrap external variable declarations by
`eval-when-compile'.
Joakim Verona [Sat, 17 Aug 2013 08:23:04 +0000 (10:23 +0200)]
merge from trunk
Xue Fuqiao [Sat, 17 Aug 2013 08:04:31 +0000 (16:04 +0800)]
* doc/emacs/text.texi (Sorting): Fix indentation.
Joakim Verona [Sat, 17 Aug 2013 04:51:11 +0000 (06:51 +0200)]
merge from trunk
Xue Fuqiao [Sat, 17 Aug 2013 04:31:22 +0000 (12:31 +0800)]
* doc/emacs/text.texi (Filling): Add cross-reference for hard newlines.
Joakim Verona [Sat, 17 Aug 2013 03:06:25 +0000 (05:06 +0200)]
merge from trunk
Xue Fuqiao [Sat, 17 Aug 2013 02:45:22 +0000 (10:45 +0800)]
* doc/emacs/text.texi (Enriched Justification): Minor fixes.
Joakim Verona [Sat, 17 Aug 2013 01:06:17 +0000 (03:06 +0200)]
merge from trunk
Xue Fuqiao [Sat, 17 Aug 2013 00:48:35 +0000 (08:48 +0800)]
Mention interactive call of buffer-disable-undo.
* doc/lispref/text.texi (Maintaining Undo): Mention interactive call of
buffer-disable-undo.
Joakim Verona [Fri, 16 Aug 2013 22:46:24 +0000 (00:46 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 22:32:24 +0000 (06:32 +0800)]
Another doc fix for `buffer-undo-list'.
Joakim Verona [Fri, 16 Aug 2013 15:32:41 +0000 (17:32 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 15:31:04 +0000 (17:31 +0200)]
(imagemagick_load_image): Remove the ping_wand code
The apparently only saved time on invalid animated images, and slowed
down everything else. Optimise for the common case.
Joakim Verona [Fri, 16 Aug 2013 15:22:23 +0000 (17:22 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 15:17:21 +0000 (17:17 +0200)]
* net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
Now that Emacs supports ImageMagick animations.
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 15:13:42 +0000 (17:13 +0200)]
image.c: Fix debugging code accidentally checked in
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 15:10:13 +0000 (17:10 +0200)]
(imagemagick_get_animation_cache): Fix a double-free error.
Joakim Verona [Fri, 16 Aug 2013 15:06:52 +0000 (17:06 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 14:54:46 +0000 (16:54 +0200)]
* image.c: Implement an ImageMagick per-image cache.
Joakim Verona [Fri, 16 Aug 2013 14:31:56 +0000 (16:31 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 14:16:45 +0000 (22:16 +0800)]
Doc fix for `buffer-undo-list'.
Joakim Verona [Fri, 16 Aug 2013 13:02:42 +0000 (15:02 +0200)]
merge from trunk
Michael Albinus [Fri, 16 Aug 2013 12:41:17 +0000 (14:41 +0200)]
* net/tramp-cmds.el (top): Don't declare `buffer-name'.
(tramp-append-tramp-buffers): Rewrite buffer local variables part.
Joakim Verona [Fri, 16 Aug 2013 10:32:03 +0000 (12:32 +0200)]
merge from trunk
Glenn Morris [Fri, 16 Aug 2013 10:17:35 +0000 (06:17 -0400)]
Auto-commit of generated files.
Joakim Verona [Fri, 16 Aug 2013 09:56:56 +0000 (11:56 +0200)]
merge from trunk
Martin Rudalics [Fri, 16 Aug 2013 09:44:32 +0000 (11:44 +0200)]
In mouse-autoselect-window-select do autoselect when mouse pointer is on margin.
* window.el (mouse-autoselect-window-select): Do autoselect when
mouse pointer is on margin.
Joakim Verona [Fri, 16 Aug 2013 08:42:10 +0000 (10:42 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 08:27:49 +0000 (16:27 +0800)]
Reverse previous change, because kill-{new, append} don't have obvious advantage.
Joakim Verona [Fri, 16 Aug 2013 08:27:49 +0000 (10:27 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 08:11:44 +0000 (16:11 +0800)]
Advertise using `kill-new' and `kill-append' in Lisp programs.
* lisp/simple.el (copy-region-as-kill, kill-ring-save): Advertise using
`kill-new' and `kill-append' in Lisp programs.
Joakim Verona [Fri, 16 Aug 2013 07:30:16 +0000 (09:30 +0200)]
merge from trunk
Glenn Morris [Fri, 16 Aug 2013 07:18:17 +0000 (00:18 -0700)]
* net/ange-ftp.el (ange-ftp-skip-msgs): Bump :version.
William Parsons [Fri, 16 Aug 2013 07:17:33 +0000 (00:17 -0700)]
* net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV (tiny change)
Fixes: debbugs:1972
Glenn Morris [Fri, 16 Aug 2013 07:13:48 +0000 (00:13 -0700)]
* lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
Handle "Remote Directory" response of some clients.
Fixes: debbugs:15058
Joakim Verona [Fri, 16 Aug 2013 07:07:17 +0000 (09:07 +0200)]
merge from trunk
Glenn Morris [Fri, 16 Aug 2013 06:53:41 +0000 (23:53 -0700)]
* bytecomp.el (byte-compile-make-variable-buffer-local): Tweak warning.
Fixes: debbugs:14926
Glenn Morris [Fri, 16 Aug 2013 06:50:58 +0000 (23:50 -0700)]
Simplify news and mail menu items
* lisp/menu-bar.el (send-mail-item-name, read-mail-item-name): Remove.
(menu-bar-tools-menu): Simplify news and mail items.
Fixes: debbugs:15095
Joakim Verona [Fri, 16 Aug 2013 06:46:48 +0000 (08:46 +0200)]
merge from trunk
Glenn Morris [Fri, 16 Aug 2013 06:33:08 +0000 (23:33 -0700)]
Add functions to change the speed of animated images
* lisp/image-mode.el (image-mode-map): Add menu items to reverse,
increase, decrease, reset animation speed.
(image--set-speed, image-increase-speed, image-decrease-speed)
(image-reverse-speed, image-reset-speed): New functions.
(image-mode-map): Add bindings for speed commands.
* lisp/image.el (image-animate-get-speed, image-animate-set-speed):
New functions.
(image-animate-timeout): Respect image :speed property.
* etc/NEWS: Mention this.
Joakim Verona [Fri, 16 Aug 2013 06:16:39 +0000 (08:16 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 06:03:18 +0000 (14:03 +0800)]
doc/lispref/text.texi(Margins): Add an index.
Joakim Verona [Fri, 16 Aug 2013 05:26:31 +0000 (07:26 +0200)]
merge from trunk
Paul Eggert [Fri, 16 Aug 2013 05:15:51 +0000 (22:15 -0700)]
Spelling fixes.
Joakim Verona [Fri, 16 Aug 2013 03:31:20 +0000 (05:31 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 03:16:03 +0000 (11:16 +0800)]
Refine the documentation of `insert-buffer-substring'.
Joakim Verona [Fri, 16 Aug 2013 02:11:12 +0000 (04:11 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 02:09:08 +0000 (10:09 +0800)]
* src/editfns.c (insert_before_markers): Mention overlay in the doc string.
Xue Fuqiao [Fri, 16 Aug 2013 01:57:58 +0000 (09:57 +0800)]
* doc/lispref/text.texi (Insertion): Add cross-references.
Joakim Verona [Fri, 16 Aug 2013 00:31:27 +0000 (02:31 +0200)]
merge from trunk
Xue Fuqiao [Fri, 16 Aug 2013 00:20:56 +0000 (08:20 +0800)]
Remove documentation of undefined behavior.
* doc/lispref/positions.texi (Character Motion):
* doc/lispref/markers.texi (Moving Markers):
(Creating Markers): Comment out undefined behavior.
* src/marker.c (set_marker): Remove documentation of undefined behavior.
Joakim Verona [Thu, 15 Aug 2013 20:21:38 +0000 (22:21 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 20:17:35 +0000 (22:17 +0200)]
Add comment.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 20:10:47 +0000 (22:10 +0200)]
Whitespace fixup.
Joakim Verona [Thu, 15 Aug 2013 20:01:31 +0000 (22:01 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 19:46:02 +0000 (21:46 +0200)]
(imagemagick_compute_animated_image): Allow certain degenerate images
(imagemagick_compute_animated_image): Allow images that say they
have sub-images that are bigger than the main image, but just crop
them.
Joakim Verona [Thu, 15 Aug 2013 19:01:43 +0000 (21:01 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 18:47:28 +0000 (20:47 +0200)]
(imagemagick_compute_animated_image): Fix animated segafault
(imagemagick_compute_animated_image): Setting the iterator row to
zero is apparently not allowed.
Joakim Verona [Thu, 15 Aug 2013 18:46:44 +0000 (20:46 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 18:34:23 +0000 (20:34 +0200)]
image.c animation touchups
* image.c (imagemagick_compute_animated_image): Animate correctly
when sub-images are smaller than the main image.
Joakim Verona [Thu, 15 Aug 2013 17:42:36 +0000 (19:42 +0200)]
merge from trunk
Jan Djärv [Thu, 15 Aug 2013 17:36:45 +0000 (19:36 +0200)]
* nsmenu.m (menuWillOpen:): Fix preprocessor test.
Fixes: debbugs:15001
Joakim Verona [Thu, 15 Aug 2013 17:32:02 +0000 (19:32 +0200)]
merge from trunk
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 17:26:34 +0000 (19:26 +0200)]
(imagemagick_compute_animated_image): Clean up code slightly
Stefan Monnier [Thu, 15 Aug 2013 17:21:19 +0000 (13:21 -0400)]
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
previous line.
(debugger-eval-expression, debugger-record-expression):
Use read--expression (bug#15102).
Fixes: debbugs:15101
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 17:20:06 +0000 (19:20 +0200)]
(imagemagick_compute_animated_image): Respect the GIF disposal methods.
Joakim Verona [Thu, 15 Aug 2013 17:16:52 +0000 (19:16 +0200)]
merge from trunk
Michael Albinus [Thu, 15 Aug 2013 17:02:09 +0000 (19:02 +0200)]
Declare external variables.
Joakim Verona [Thu, 15 Aug 2013 16:41:51 +0000 (18:41 +0200)]
merge from trunk
Ken Brown [Thu, 15 Aug 2013 16:37:15 +0000 (12:37 -0400)]
Revert last change to gmalloc.c; update some comments.
Paul Eggert [Thu, 15 Aug 2013 16:28:42 +0000 (09:28 -0700)]
Fix minor problems found by static checking.
* frame.c (delete_frame):
* xdisp.c (next_element_from_display_vector):
Avoid uninitialized local.
* image.c (imagemagick_compute_animated_image): Port to C89.
Prefer usual GNU indentation style for loops.
Be more careful about bizarrely large sizes, by using ptrdiff_t
instead of int.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 16:03:56 +0000 (18:03 +0200)]
Further image.c compilation warning fixes
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 16:01:13 +0000 (18:01 +0200)]
(imagemagick_compute_animated_image): Implement a simple cache
(imagemagick_compute_animated_image): Fix some compilation
warnings. Implement a very simple cache to make the animation
usable at all, but it should be replaced with a per-image cache.
Joakim Verona [Thu, 15 Aug 2013 15:42:45 +0000 (17:42 +0200)]
merge from trunk
Dmitry Antipov [Thu, 15 Aug 2013 15:37:03 +0000 (19:37 +0400)]
Fix infinite frame selection loop (Bug#15025).
* frame.c (delete_frame): Prefer fast ad-hoc loop to next_frame.
Joakim Verona [Thu, 15 Aug 2013 15:32:29 +0000 (17:32 +0200)]
merge from trunk
Eli Zaretskii [Thu, 15 Aug 2013 15:28:53 +0000 (18:28 +0300)]
Fix bug #15099 with 'box' face attribute in display tables.
src/xdisp.c (next_element_from_display_vector): Support 'box' face attribute
in the face definitions of a display vector.
Joakim Verona [Thu, 15 Aug 2013 15:21:47 +0000 (17:21 +0200)]
merge from trunk
Eli Zaretskii [Thu, 15 Aug 2013 15:20:03 +0000 (18:20 +0300)]
Fix bug #15090 with redisplay under linum-mode and visual-line-mode.
src/xdisp.c (compute_window_start_on_continuation_line): When
WORD_WRAP is in effect, use move_it_to instead of move_it_by_lines
to make sure we end up setting the window start at the leftmost
visible character of the display line. This avoids funky
horizontal shifting because the window start is not kept on the
same position.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 15:10:12 +0000 (17:10 +0200)]
* image.c (imagemagick_compute_animated_image): Implement animated images.
Fixes: debbugs:14700
Joakim Verona [Thu, 15 Aug 2013 15:06:31 +0000 (17:06 +0200)]
merge from trunk