]> git.eshelyaron.com Git - emacs.git/log
emacs.git
11 years agoMerge branch 'xwidget' of https://github.com/jave/xwidget-emacs into xwidget
Joakim Verona [Mon, 19 Aug 2013 18:48:07 +0000 (20:48 +0200)]
Merge branch 'xwidget' of https://github.com/jave/xwidget-emacs into xwidget

11 years ago* test/automated/xwidget-tests.el: Emacs parallel API changed.
Grégoire Jadi [Mon, 19 Aug 2013 18:46:58 +0000 (20:46 +0200)]
* test/automated/xwidget-tests.el: Emacs parallel API changed.

11 years agoUpdate Emacs Parallel
Grégoire Jadi [Mon, 19 Aug 2013 18:46:52 +0000 (20:46 +0200)]
Update Emacs Parallel

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 18:11:40 +0000 (20:11 +0200)]
merge from trunk

11 years ago(imagemagick_get_animation_cache): Fix memory leak.
Lars Magne Ingebrigtsen [Mon, 19 Aug 2013 17:56:58 +0000 (19:56 +0200)]
(imagemagick_get_animation_cache): Fix memory leak.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 16:38:33 +0000 (18:38 +0200)]
merge from trunk

11 years ago* image.c: Space before paren.
Paul Eggert [Mon, 19 Aug 2013 16:24:06 +0000 (09:24 -0700)]
* image.c: Space before paren.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 15:26:39 +0000 (17:26 +0200)]
merge from trunk

11 years agoFix previous commit.
Lars Magne Ingebrigtsen [Mon, 19 Aug 2013 15:14:42 +0000 (17:14 +0200)]
Fix previous commit.

(imagemagick_get_animation_cache): Revert to previous definition
so that it actually works.  But keep the memory leak fix.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 15:07:07 +0000 (17:07 +0200)]
merge from trunk

11 years ago* image.c (imagemagick_get_animation_cache): Don't segfault on each invocation.
Lars Magne Ingebrigtsen [Mon, 19 Aug 2013 14:52:52 +0000 (16:52 +0200)]
* image.c (imagemagick_get_animation_cache): Don't segfault on each invocation.

Bug introduced by 2013-08-19T07:01:37Z!eggert@cs.ucla.edu, which obviously hadn't even been
tested once.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 10:31:39 +0000 (12:31 +0200)]
merge from trunk

11 years agoAuto-commit of generated files.
Glenn Morris [Mon, 19 Aug 2013 10:17:37 +0000 (06:17 -0400)]
Auto-commit of generated files.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 07:16:32 +0000 (09:16 +0200)]
merge from trunk

11 years ago* image.c: Fix animation cache signature memory leak.
Paul Eggert [Mon, 19 Aug 2013 07:01:37 +0000 (00:01 -0700)]
* image.c: Fix animation cache signature memory leak.

Fix some other minor performance problems while we're at it.
(imagemagick_create_cache): Clear just the members that
need clearing.  Don't set update_time, as caller does that now.
(imagemagick_prune_animation_cache, imagemagick_get_animation_cache):
Simplify by using pointer-to-pointer instead of a prev pointer.
(imagemagick_prune_animation_cache): Use make_emacs_time rather
than EMACS_TIME_FROM_DOUBLE, and DestroyString rather than free.
(imagemagick_get_animation_cache): Don't xstrdup the image signature;
it's already a copy.  Free the signature probe unless it's cached.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 06:01:26 +0000 (08:01 +0200)]
merge from trunk

11 years ago* process.c (handle_child_signal): Fix crash; deleted pid.
Paul Eggert [Mon, 19 Aug 2013 05:46:17 +0000 (22:46 -0700)]
* process.c (handle_child_signal): Fix crash; deleted pid.

This was introduced by my 2013-08-12 fix for Bug#15035.

Fixes: debbugs:15106
11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 05:36:22 +0000 (07:36 +0200)]
merge from trunk

11 years agoMerge from gnulib.
Paul Eggert [Mon, 19 Aug 2013 05:23:05 +0000 (22:23 -0700)]
Merge from gnulib.

This incorporates:
2013-08-15 warnings: minor optimization
2013-08-15 warnings: check -Wfoo rather than -Wno-foo

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 05:21:04 +0000 (07:21 +0200)]
merge from trunk

11 years agoGnus: Exclude iso-2022-jp-2 and shift_jis from the default value set to mm-coding...
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

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 04:36:32 +0000 (06:36 +0200)]
merge from trunk

11 years ago* image.c (imagemagick_create_cache, imagemagick_get_animation_cache)
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.

11 years agomerge from trunk
Joakim Verona [Sun, 18 Aug 2013 23:26:26 +0000 (01:26 +0200)]
merge from trunk

11 years agoMinor improving in indexing of buffer position.
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.

11 years agomerge from trunk
Joakim Verona [Sun, 18 Aug 2013 19:31:48 +0000 (21:31 +0200)]
merge from trunk

11 years agoMinor improving in indexing of "region".
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.

11 years ago* image.c (imagemagick_get_animation_cache): Don't segfault when
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.

11 years agomerge from trunk
Joakim Verona [Sun, 18 Aug 2013 17:52:01 +0000 (19:52 +0200)]
merge from trunk

11 years agoChange size of static heap on Cygwin; report maximum usage after dumping.
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.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 17:31:47 +0000 (19:31 +0200)]
merge from trunk

11 years agoFix a minor issue with loading zlib DLL on MS-Windows.
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.

11 years ago* text.texi (Case Changes): Fix an `args-out-of-range' error in the example.
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.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 11:26:52 +0000 (13:26 +0200)]
merge from trunk

11 years ago* doc/lispref/modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes.
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.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 11:01:45 +0000 (13:01 +0200)]
merge from trunk

11 years ago* doc/emacs/text.texi (Columns): Comment out undefined behavior.
Xue Fuqiao [Sat, 17 Aug 2013 10:46:11 +0000 (18:46 +0800)]
* doc/emacs/text.texi (Columns): Comment out undefined behavior.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 10:31:59 +0000 (12:31 +0200)]
merge from trunk

11 years ago* net/tramp.el:
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'.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 08:23:04 +0000 (10:23 +0200)]
merge from trunk

11 years ago* doc/emacs/text.texi (Sorting): Fix indentation.
Xue Fuqiao [Sat, 17 Aug 2013 08:04:31 +0000 (16:04 +0800)]
* doc/emacs/text.texi (Sorting): Fix indentation.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 04:51:11 +0000 (06:51 +0200)]
merge from trunk

11 years ago* doc/emacs/text.texi (Filling): Add cross-reference for hard newlines.
Xue Fuqiao [Sat, 17 Aug 2013 04:31:22 +0000 (12:31 +0800)]
* doc/emacs/text.texi (Filling): Add cross-reference for hard newlines.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 03:06:25 +0000 (05:06 +0200)]
merge from trunk

11 years ago* doc/emacs/text.texi (Enriched Justification): Minor fixes.
Xue Fuqiao [Sat, 17 Aug 2013 02:45:22 +0000 (10:45 +0800)]
* doc/emacs/text.texi (Enriched Justification): Minor fixes.

11 years agomerge from trunk
Joakim Verona [Sat, 17 Aug 2013 01:06:17 +0000 (03:06 +0200)]
merge from trunk

11 years agoMention interactive call of buffer-disable-undo.
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 22:46:24 +0000 (00:46 +0200)]
merge from trunk

11 years agoAnother doc fix for `buffer-undo-list'.
Xue Fuqiao [Fri, 16 Aug 2013 22:32:24 +0000 (06:32 +0800)]
Another doc fix for `buffer-undo-list'.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 15:32:41 +0000 (17:32 +0200)]
merge from trunk

11 years ago(imagemagick_load_image): Remove the ping_wand code
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 15:22:23 +0000 (17:22 +0200)]
merge from trunk

11 years ago* net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
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.

11 years agoimage.c: Fix debugging code accidentally checked in
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 15:13:42 +0000 (17:13 +0200)]
image.c: Fix debugging code accidentally checked in

11 years ago(imagemagick_get_animation_cache): Fix a double-free error.
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 15:10:13 +0000 (17:10 +0200)]
(imagemagick_get_animation_cache): Fix a double-free error.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 15:06:52 +0000 (17:06 +0200)]
merge from trunk

11 years ago* image.c: Implement an ImageMagick per-image cache.
Lars Magne Ingebrigtsen [Fri, 16 Aug 2013 14:54:46 +0000 (16:54 +0200)]
* image.c: Implement an ImageMagick per-image cache.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 14:31:56 +0000 (16:31 +0200)]
merge from trunk

11 years agoDoc fix for `buffer-undo-list'.
Xue Fuqiao [Fri, 16 Aug 2013 14:16:45 +0000 (22:16 +0800)]
Doc fix for `buffer-undo-list'.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 13:02:42 +0000 (15:02 +0200)]
merge from trunk

11 years ago* net/tramp-cmds.el (top): Don't declare `buffer-name'.
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 10:32:03 +0000 (12:32 +0200)]
merge from trunk

11 years agoAuto-commit of generated files.
Glenn Morris [Fri, 16 Aug 2013 10:17:35 +0000 (06:17 -0400)]
Auto-commit of generated files.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 09:56:56 +0000 (11:56 +0200)]
merge from trunk

11 years agoIn mouse-autoselect-window-select do autoselect when mouse pointer is on margin.
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 08:42:10 +0000 (10:42 +0200)]
merge from trunk

11 years agoReverse previous change, because kill-{new, append} don't have obvious advantage.
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 08:27:49 +0000 (10:27 +0200)]
merge from trunk

11 years agoAdvertise using `kill-new' and `kill-append' in Lisp programs.
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 07:30:16 +0000 (09:30 +0200)]
merge from trunk

11 years ago* net/ange-ftp.el (ange-ftp-skip-msgs): Bump :version.
Glenn Morris [Fri, 16 Aug 2013 07:18:17 +0000 (00:18 -0700)]
* net/ange-ftp.el (ange-ftp-skip-msgs): Bump :version.

11 years ago* net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV (tiny change)
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
11 years ago* lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
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
11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 07:07:17 +0000 (09:07 +0200)]
merge from trunk

11 years ago* bytecomp.el (byte-compile-make-variable-buffer-local): Tweak warning.
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
11 years agoSimplify news and mail menu items
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
11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 06:46:48 +0000 (08:46 +0200)]
merge from trunk

11 years agoAdd functions to change the speed of animated images
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.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 06:16:39 +0000 (08:16 +0200)]
merge from trunk

11 years agodoc/lispref/text.texi(Margins): Add an index.
Xue Fuqiao [Fri, 16 Aug 2013 06:03:18 +0000 (14:03 +0800)]
doc/lispref/text.texi(Margins): Add an index.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 05:26:31 +0000 (07:26 +0200)]
merge from trunk

11 years agoSpelling fixes.
Paul Eggert [Fri, 16 Aug 2013 05:15:51 +0000 (22:15 -0700)]
Spelling fixes.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 03:31:20 +0000 (05:31 +0200)]
merge from trunk

11 years agoRefine the documentation of `insert-buffer-substring'.
Xue Fuqiao [Fri, 16 Aug 2013 03:16:03 +0000 (11:16 +0800)]
Refine the documentation of `insert-buffer-substring'.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 02:11:12 +0000 (04:11 +0200)]
merge from trunk

11 years ago* src/editfns.c (insert_before_markers): Mention overlay in the doc string.
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.

11 years ago* doc/lispref/text.texi (Insertion): Add cross-references.
Xue Fuqiao [Fri, 16 Aug 2013 01:57:58 +0000 (09:57 +0800)]
* doc/lispref/text.texi (Insertion): Add cross-references.

11 years agomerge from trunk
Joakim Verona [Fri, 16 Aug 2013 00:31:27 +0000 (02:31 +0200)]
merge from trunk

11 years agoRemove documentation of undefined behavior.
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.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 20:21:38 +0000 (22:21 +0200)]
merge from trunk

11 years agoAdd comment.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 20:17:35 +0000 (22:17 +0200)]
Add comment.

11 years agoWhitespace fixup.
Lars Magne Ingebrigtsen [Thu, 15 Aug 2013 20:10:47 +0000 (22:10 +0200)]
Whitespace fixup.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 20:01:31 +0000 (22:01 +0200)]
merge from trunk

11 years ago(imagemagick_compute_animated_image): Allow certain degenerate images
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.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 19:01:43 +0000 (21:01 +0200)]
merge from trunk

11 years ago(imagemagick_compute_animated_image): Fix animated segafault
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.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 18:46:44 +0000 (20:46 +0200)]
merge from trunk

11 years agoimage.c animation touchups
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.

11 years agomerge from trunk
Joakim Verona [Thu, 15 Aug 2013 17:42:36 +0000 (19:42 +0200)]
merge from trunk

11 years ago* nsmenu.m (menuWillOpen:): Fix preprocessor test.
Jan Djärv [Thu, 15 Aug 2013 17:36:45 +0000 (19:36 +0200)]
* nsmenu.m (menuWillOpen:): Fix preprocessor test.

Fixes: debbugs:15001