]> git.eshelyaron.com Git - emacs.git/log
emacs.git
11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 03:16:38 +0000 (05:16 +0200)]
merge from trunk

11 years agoRedesign redisplay interface to drop updated_row and updated_area.
Dmitry Antipov [Fri, 23 Aug 2013 03:03:37 +0000 (07:03 +0400)]
Redesign redisplay interface to drop updated_row and updated_area.
* dispextern.h (updated_row, updated_area): Remove declaration.
(struct redisplay_interface): Pass glyph row and row area parameters
to write_glyphs, insert_glyphs and clear_end_of_line functions.
(x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
Adjust prototypes.
* dispnew.c (updated_row, updated_area): Remove.
(redraw_overlapped_rows, update_window_line): Adjust user.
(update_marginal_area, update_text_area): Likewise.  Pass updated row
as a parameter.  Prefer enum glyph_row_area to int where appropriate.
* xdisp.c (x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
Adjust users.

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

11 years ago* process.c (flush_pending_output): Remove stub.
Paul Eggert [Thu, 22 Aug 2013 18:29:51 +0000 (11:29 -0700)]
* process.c (flush_pending_output): Remove stub.

All uses removed.

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

11 years ago* configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically.
Paul Eggert [Thu, 22 Aug 2013 17:35:00 +0000 (10:35 -0700)]
* configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically.

This improves on the patch already installed, by quoting options
that contain spaces and suchlike systematically, so that
EMACS_CONFIG_OPTIONS is no longer ambiguous when options contain
these characters.

Fixes: debbugs:13274
11 years agomerge from trunk
Joakim Verona [Thu, 22 Aug 2013 04:21:28 +0000 (06:21 +0200)]
merge from trunk

11 years ago* lisp/erc/erc.el: Use lexical-binding.
Stefan Monnier [Thu, 22 Aug 2013 04:06:45 +0000 (00:06 -0400)]
* lisp/erc/erc.el: Use lexical-binding.
(erc-user-full-name): Minor CSE simplification.
(erc-mode-map): Assume command-remapping is available.
(erc-once-with-server-event): Replace `forms' arg with a function arg.
(erc-once-with-server-event-global): Remove.
(erc-ison-p): Adjust to change in erc-once-with-server-event.
(erc-get-buffer-create): Remove arg `proc'.
(iswitchb-make-buflist-hook): Declare.
(erc-setup-buffer): Use pcase; avoid ((lambda ..) ..).
(read-passwd): Assume it exists.
(erc-display-line, erc-cmd-IDLE): Avoid add-to-list, adjust to change
in erc-once-with-server-event.
(erc-cmd-JOIN, erc-set-channel-limit, erc-set-channel-key)
(erc-add-query): Minor CSE simplification.
(erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Adjust to change
in erc-once-with-server-event.
(erc-echo-notice-in-user-and-target-buffers): Avoid add-to-list.
* lisp/erc/erc-track.el: Use lexical-binding.
(erc-make-mode-line-buffer-name): Use closures instead of `(lambda...).
(erc-faces-in): Avoid add-to-list.
* lisp/erc/erc-notify.el: Use lexical-binding.
(erc-notify-timer): Adjust to change in erc-once-with-server-event.
(erc-notify-QUIT): Use a closure instead of `(lambda...).
* lisp/erc/erc-list.el: Use lexical-binding.
(erc-list-install-322-handler, erc-cmd-LIST): Adjust to change in
erc-once-with-server-event.
* lisp/erc/erc-button.el: Use lexical-binding.
(erc-button-next-function): Use a closure instead of `(lambda...).

11 years agomerge from trunk
Joakim Verona [Thu, 22 Aug 2013 01:21:36 +0000 (03:21 +0200)]
merge from trunk

11 years ago* lisp/calendar/timeclock.el: Minor cleanups.
Stefan Monnier [Thu, 22 Aug 2013 01:09:08 +0000 (21:09 -0400)]
* lisp/calendar/timeclock.el: Minor cleanups.
(timeclock-ask-before-exiting, timeclock-use-display-time): Use `symbol'.
(timeclock-modeline-display): Define as alias before the actual definition.
(timeclock-mode-line-display): Use define-minor-mode.
(timeclock-day-list-template): Make it a function, add an argument.
(timeclock-day-list-required, timeclock-day-list-length)
(timeclock-day-list-debt, timeclock-day-list-span)
(timeclock-day-list-break): Adjust calls accordingly.

11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 21:41:33 +0000 (23:41 +0200)]
merge from trunk

11 years ago* callproc.c: Fix race that killed background processes.
Paul Eggert [Wed, 21 Aug 2013 21:27:30 +0000 (14:27 -0700)]
* callproc.c: Fix race that killed background processes.

(call_process): New arg TEMPFILE_INDEX.  Callers changed.
Record deleted process-id in critical section, not afterwards.
Don't mistakenly kill process created by a call-process invocation
that discards output and does not wait.

Fixes: debbugs:15144
11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 19:56:47 +0000 (21:56 +0200)]
merge from trunk

11 years agoImported EIEIO test suite from CEDET upstream
David Engster [Wed, 21 Aug 2013 19:42:52 +0000 (21:42 +0200)]
Imported EIEIO test suite from CEDET upstream

* automated/eieio-tests.el, automated/eieio-test-persist.el:
* automated/eieio-test-methodinvoke.el: EIEIO tests from CEDET
  upstream.  Changed to use ERT.

11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 18:37:17 +0000 (20:37 +0200)]
merge from trunk

11 years ago* lisp/emacs-lisp/pp.el (pp-eval-expression, pp-macroexpand-expression):
Stefan Monnier [Wed, 21 Aug 2013 18:26:15 +0000 (14:26 -0400)]
* lisp/emacs-lisp/pp.el (pp-eval-expression, pp-macroexpand-expression):
Use read--expression so that completion works again.

11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 10:31:36 +0000 (12:31 +0200)]
merge from trunk

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

11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 07:22:05 +0000 (09:22 +0200)]
merge from trunk

11 years agoFix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE
Dmitry Antipov [Wed, 21 Aug 2013 07:02:45 +0000 (11:02 +0400)]
Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE
and GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES.
* alloc.c (toplevel): Remove unnecessary nested #if...#endif.
(mark_maybe_object) [!GC_MARK_STACK]: Define to emacs_abort
to shut up compiler in mark_object.
(dump_zombies): Convert to global and add EXTERNALLY_VISIBLE.

11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 06:33:57 +0000 (08:33 +0200)]
merge from trunk

11 years agoPort close-on-exec pty creation to FreeBSD 9.1-RELEASE.
Paul Eggert [Wed, 21 Aug 2013 06:11:50 +0000 (23:11 -0700)]
Port close-on-exec pty creation to FreeBSD 9.1-RELEASE.

* configure.ac (PTY_OPEN): If posix_openpt with O_CLOEXEC fails
and reports EINVAL, try it again without O_CLOEXEC.  This should
port PTY_OPEN to FreeBSD 9, which stupidly rejects O_CLOEXEC.
What were they thinking?

Fixes: debbugs:15129
11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 05:51:39 +0000 (07:51 +0200)]
merge from trunk

11 years ago* process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag.
Paul Eggert [Wed, 21 Aug 2013 05:39:51 +0000 (22:39 -0700)]
* process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag.

We can't portably rely on PTY_OPEN doing that, even if
it calls posix_openpt with O_CLOEXEC.

11 years agomerge from trunk
Joakim Verona [Wed, 21 Aug 2013 01:31:39 +0000 (03:31 +0200)]
merge from trunk

11 years agoAdd rudimentary inferior shell interaction
Sam Steingold [Wed, 21 Aug 2013 01:16:27 +0000 (21:16 -0400)]
Add rudimentary inferior shell interaction
* lisp/progmodes/sh-script.el (sh-shell-process): New buffer-local variable.
(sh-set-shell): Reset it.
(sh-show-shell, sh-cd-here, sh-send-line-or-region-and-step): New
commands (bound to C-c C-z, C-c C-d, and C-c C-n).

11 years agomerge from trunk
Joakim Verona [Tue, 20 Aug 2013 22:26:48 +0000 (00:26 +0200)]
merge from trunk

11 years ago* lisp/align.el: Use lexical-binding.
Stefan Monnier [Tue, 20 Aug 2013 22:13:29 +0000 (18:13 -0400)]
* lisp/align.el: Use lexical-binding.
(align-region): Simplify accordingly.

11 years agomerge from trunk
Joakim Verona [Tue, 20 Aug 2013 15:03:30 +0000 (17:03 +0200)]
merge from trunk

11 years agosrc/character.c (string_char): Improve commentary.
Kenichi Handa [Tue, 20 Aug 2013 14:56:03 +0000 (17:56 +0300)]
src/character.c (string_char): Improve commentary.

11 years agoDocument problems with Windows file names that end in blanks.
Eli Zaretskii [Tue, 20 Aug 2013 14:49:09 +0000 (17:49 +0300)]
Document problems with Windows file names that end in blanks.

 doc/lispref/files.texi (Information about Files): Mention file names with
 trailing blanks on MS-Windows.  (Bug#15130)

11 years agomerge from trunk
Joakim Verona [Tue, 20 Aug 2013 10:16:47 +0000 (12:16 +0200)]
merge from trunk

11 years ago* minibuffer.el (completion--sifn-requote): Bind `non-essential'.
Michael Albinus [Tue, 20 Aug 2013 10:04:13 +0000 (12:04 +0200)]
* minibuffer.el (completion--sifn-requote): Bind `non-essential'.

* rfn-eshadow.el (rfn-eshadow-update-overlay): Move binding of
`non-essential' up.

11 years agomerge from trunk
Joakim Verona [Tue, 20 Aug 2013 08:41:59 +0000 (10:41 +0200)]
merge from trunk

11 years ago* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Paul Eggert [Tue, 20 Aug 2013 08:30:24 +0000 (01:30 -0700)]
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):

Fix shell-operator precedence problem in previous change.

11 years agomerge from trunk
Joakim Verona [Tue, 20 Aug 2013 06:46:50 +0000 (08:46 +0200)]
merge from trunk

11 years agoRemove stray execute bit
Glenn Morris [Tue, 20 Aug 2013 06:39:17 +0000 (23:39 -0700)]
Remove stray execute bit

11 years ago* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Glenn Morris [Tue, 20 Aug 2013 06:36:10 +0000 (23:36 -0700)]
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Clean test/automated if present.

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

11 years ago* image.c (SIGNATURE_DIGESTSIZE): Remove.
Paul Eggert [Tue, 20 Aug 2013 00:51:35 +0000 (17:51 -0700)]
* image.c (SIGNATURE_DIGESTSIZE): Remove.

(struct animation_cache): Make signature a flexible array member.
All uses changed.  This is a tad slower but may insulate us better
from future changes to ImageMagick.

11 years agomerge from trunk
Joakim Verona [Mon, 19 Aug 2013 21:01:49 +0000 (23:01 +0200)]
merge from trunk

11 years ago* image.c: Shrink memory needed for animation cache.
Paul Eggert [Mon, 19 Aug 2013 20:47:27 +0000 (13:47 -0700)]
* image.c: Shrink memory needed for animation cache.

(SIGNATURE_DIGESTSIZE): New constant.
(struct animation_cache): Make 'signature' a fixed size array of bytes.
(imagemagick_create_cache): Copy the signature.  This saves
several KB of memory that ImageMagick wastes per signature.
Don't bother updating the update_time, as the caller does that now.
(imagemagick_prune_animation_cache): Don't destroy the signature, as
it's a fixed size struct member now.
(imagemagick_get_animation_cache): Always destroy the signature,
as it's now imagemagick_create_cache's responsibility to copy it.
Avoid duplicate calls to strcmp and to imagemagick_create_cache,
and use memcmp rather than strcmp.
eassert that ImageMagick returns a signature of the specified length.

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