merge from trunk

Declare external variables.

merge from trunk

Revert last change to gmalloc.c; update some comments.

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.

Further image.c compilation warning fixes

(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.

merge from trunk

Fix infinite frame selection loop (Bug#15025).
* frame.c (delete_frame): Prefer fast ad-hoc loop to next_frame.

merge from trunk

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.

merge from trunk

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.

* image.c (imagemagick_compute_animated_image): Implement animated images.

Fixes: debbugs:14700

merge from trunk

* lisp.h (FOR_EACH_ALIST_VALUE): New macro
to do `for' loops over alist values.
* buffer.h (FOR_EACH_BUFFER):
* process.c (FOR_EACH_PROCESS): Use it.
(handle_child_signal, status_notify, Fget_buffer_process)
(kill_buffer_processes): Use FOR_EACH_PROCESS.

merge from trunk

Remove byte compiler warnings, visible when compiling with
`byte-compile-force-lexical-warnings' set to t.

* net/tramp.el (tramp-debug-message, tramp-message, tramp-error)
(tramp-error-with-buffer): Rename ARGS to ARGUMENTS and BUFFER to BUF.
(tramp-handle-unhandled-file-name-directory)
(tramp-handle-file-notify-add-watch, tramp-action-login)
(tramp-action-succeed, tramp-action-permission-denied)
(tramp-action-terminal, tramp-action-process-alive): Prefix unused
arguments with "_".

* net/tramp-adb.el (tramp-adb-parse-device-names)
(tramp-adb-handle-insert-directory, tramp-adb-handle-delete-file)
(tramp-adb-handle-copy-file): Prefix unused arguments with "_".
(tramp-adb-handle-file-truename): Remove unused arguments.

* net/tramp-cache.el (tramp-flush-directory-property)
(tramp-flush-connection-property, tramp-list-connections)
(tramp-parse-connection-properties): Prefix unused arguments with "_".

* net/tramp-compat.el (tramp-compat-make-temp-file): Rename
FILENAME to F.

* net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch)
(tramp-gvfs-handle-write-region, tramp-bluez-parse-device-names)
(tramp-zeroconf-parse-workstation-device-names)
(tramp-zeroconf-parse-webdav-device-names)
(tramp-synce-parse-device-names): Prefix unused arguments with "_".

* net/tramp-gw.el (tramp-gw-gw-proc-sentinel)
(tramp-gw-aux-proc-sentinel): Prefix unused arguments with "_".

* net/tramp-sh.el (tramp-sh-handle-file-truename): Remove unused
arguments.
(tramp-sh-handle-copy-file, tramp-sh-handle-dired-compress-file)
(tramp-sh-handle-insert-file-contents-literally)
(tramp-sh-handle-file-notify-add-watch): Prefix unused arguments
with "_".
(tramp-do-copy-or-rename-file, tramp-barf-if-no-shell-prompt):
Remove unused variables.

* net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-delete-file)
(tramp-smb-read-file-entry): Prefix unused arguments with "_".

* net/tramp-uu.el (tramp-uu-b64-alphabet, tramp-uu-b64-char-to-byte):
Make them a defconst.
(tramp-uuencode-region): Remove unused variable.

merge from trunk

* doc/lispref/markers.texi (The Region): Add/move indexes.

merge from trunk

Stop keeping etc/refcards generated PDFs in the repository

They are on the gnu.org website and will be in the release tarfiles.

* admin/make-tarball.txt: Mention generating pdfs in etc/refcards.

* etc/refcards/calccard.pdf, etc/refcards/cs-dired-ref.pdf:
* etc/refcards/cs-refcard.pdf, etc/refcards/de-refcard.pdf:
* etc/refcards/dired-ref.pdf, etc/refcards/fr-dired-ref.pdf:
* etc/refcards/fr-refcard.pdf, etc/refcards/gnus-booklet.pdf:
* etc/refcards/gnus-refcard.pdf, etc/refcards/orgcard.pdf:
* etc/refcards/pl-refcard.pdf, etc/refcards/pt-br-refcard.pdf:
* etc/refcards/refcard.pdf, etc/refcards/ru-refcard.pdf:
* etc/refcards/sk-dired-ref.pdf, etc/refcards/sk-refcard.pdf:
Remove generated files from repository.

merge from trunk

Cleanup for etc/refcards/Makefile and related items

* .bzrignore: Unignore etc/refcards/Makefile.

* make-dist: Do not distribute etc/refcards TeX intermediate files.

* Makefile.in (install-arch-indep):
Do not install etc/refcards TeX intermediate files.

* etc/refcards/Makefile: Rewrite to use portable Makefile syntax.
Add language-specific targets.
(distclean, extraclean): New rules.

*  etc/refcards/README: Add copyright and license.  Add Makefile details.
Mention http and FSF store versions.

* admin/notes/hydra: More information about Hydra.

merge from trunk

* term.c (get_named_tty, create_tty_output, tty_free_frame_resources)
(tty_free_frame_resources, delete_tty): Prefer eassert to emacs_abort.
* image.c (make_image_cache): For struct image_cache, prefer xmalloc
to xzalloc and so avoid redundant call to memset.
* xterm.c (x_term_init): Avoid unnecessary initializations of dpyinfo
members because it is allocated with xzalloc and so already zeroed.

merge from trunk

* src/gmalloc.c [CYGWIN]: Rename memalign (Bug#15094).

merge from trunk

Utility function and macro to copy Lisp string to C string.
* lisp.h (xlispstrdupa): New macro.
(xlispstrdup): New prototype.
* alloc.c (xlispstrdup): New function.
* callint.c (Fcall_interactively):
* fileio.c (Ffile_name_directory, Fexpand_file_name)
(Fsubstitute_in_file_name):
* frame.c (Fmake_terminal_frame): Use xlispstrdupa.
* image.c (x_create_bitmap_from_file):
* w32term.c (w32_term_init):
* xterm.c (x_term_init): Use xlispstrdup.

merge from trunk

Refine previous change.

* src/marker.c (set_marker): Reformat documentation.

merge from trunk

* image.c (imagemagick_load_image): Make animated pictures work.

There's still some problems with background color settings, though.

Fixes: debbugs:14700

merge from trunk

lisp/frameset.el: Allow orphaned minibufferless frames.
(frameset-filter-minibuffer): Deal with the case that the minibuffer
parameter was already set in FILTERED.  Doc fix.
(frameset--record-minibuffer-relationships): Allow saving a
minibufferless frame without its corresponding minibuffer frame.
(frameset--reuse-frame): Accept a match from an orphaned minibufferless
frame, if the frame id matches.
(frameset--minibufferless-last-p): Sort non-orphaned minibufferless
frames before orphaned ones.
(frameset-restore): Warn about orphaned windows, instead of error out.

lisp/frameset.el: Use gv-setter declaration.
(frameset--prop-setter): New function.
(frameset-prop): Add gv-setter declaration.

merge from trunk

* url-http.el (url-http-parse-headers): Always place point at the
start of the buffer instead of just 80% of the time.

* decompress.c (unwind_decompress): Always restore point.

merge from trunk

* doc/emacs/files.texi (Filesets): Add an index.

merge from trunk

Auto-commit of generated files.

merge from trunk

Fix some issues in window.el.

* window.el (window-make-atom): Don't overwrite parameter
already present.
(display-buffer-in-atom-window): Handle special case where we
split an already atomic window.
(window--major-non-side-window, display-buffer-in-side-window)
(window--side-check): Ignore minibuffer window when walking
window tree.
(window-deletable-p): Return 'frame only if no other frame uses
our minibuffer window.
(record-window-buffer): Run buffer-list-update-hook.
(split-window): Make sure window--check-frame won't destroy an
existing atomic window in case the new window gets nested
inside.
(display-buffer-at-bottom): Ignore minibuffer window when
walking window tree.  Don't split a side window.
(pop-to-buffer): Don't set-buffer here, the select-window call
should do that.
(mouse-autoselect-window-select): Autoselect only if we are in the
text portion of the window.

merge from trunk

* xdisp.c (redisplay_window): If window_end_valid is cleared due to
non-zero windows_or_buffers_changed, clear current_matrix_up_to_date_p
and so do not call to try_cursor_movement for that window.

merge from trunk

* xdisp.c (cursor_type_changed): Now static.

* image.c (imagemagick_filename_hint): New arg HINT_BUFFER.

Use changed.  This avoids the need to call xmalloc and for the
caller to call xfree, and avoids memory leaks in some situations.

merge from trunk

* xdisp.c (adjust_window_ends): Move duplicated code to new function.
(try_window, try_window_reusing_current_matrix, try_window_id): Use it.

* window.h (struct window): Convert window_end_pos and
window_end_vpos from Lisp_Object to ptrdiff_t and int, respectively.
(wset_window_end_pos, wset_window_end_vpos): Remove.
* dispnew.c (adjust_glyph_matrix):
* window.c (Fwindow_end, replace_window, set_window_buffer)
(make_window):
* xdisp.c (check_window_end, move_it_to, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, try_window)
(try_window_reusing_current_matrix, find_first_unchanged_at_end_row)
(try_window_id, decode_mode_spec, mouse_face_from_buffer_pos)
(note_mouse_highlight): Adjust users.
(try_cursor_movement): Likewise.  Convert old precondition to eassert.
Add comment.

merge from trunk

Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit.
* image.c (imagemagick_filename_hint): Use `const char *' and
prefer SSDATA to SDATA to avoid warnings.

merge from trunk

Cleanup window fringes, margins and scroll bars adjustments.
* window.c (set_window_fringes, set_window_margins)
(set_window_scroll_bars, apply_window_adjustment): New functions.
(set_window_buffer, Fset_window_margins, Fset_window_fringes)
(Fset_window_scroll_bars): Use them.

* window.h (struct window): Convert scroll_bar_width
from Lisp_Object to integer.  Adjust comment.
(WINDOW_CONFIG_SCROLL_BAR_WIDTH, WINDOW_CONFIG_SCROLL_BAR_COLS):
Adjust users.
* window.c (wset_scroll_bar_width): Remove.
(make_window): Initialize scroll_bar_width.
(Fsplit_window_internal): Use direct assignment.
(Fset_window_configuration, save_window_save):
Convert Lisp_Object to integer and back where appropriate.
(Fset_window_scroll_bars): Adjust user.  Return t if any scroll
bar was actually changed, and mention this in docstring.

merge from trunk

* configure.ac (EMACS_CONFIGURATION): Escape backslashes.

Fixes: debbugs:15091

merge from trunk

* package-test.el: Remove tar-package-building functions.  Tar file
used for testing is included in the repository.
(package-test-install-texinfo, package-test-cleanup-built-files): Remove.

merge from trunk

* decompress.c: Minor simplifications.

(Fzlib_decompress_region): Don't bother verifying
that avail_out <= UINT_MAX, as that was confusing.
Mention the restriction in a comment instead.
Prefer 'int' to 'ptrdiff_t' when 'int' is wide enough.

merge from trunk

Fix OSX 10.4 compiler errors.
* nsmenu.m (x_activate_menubar): Check for OSX >= 10.5
(trackingNotification:): Call ns_check_menu_open only for OSX >= 10.5.

Rename :content-type to :format in `create-image'

merge from trunk

White-space cleanup.

* image.c (imagemagick_filename_hint): Check for errors in the alist structure.

merge from trunk

Make shr feed Content-Type to the image-creating libraries

This finally makes it possible to display icons.

* net/eww.el (eww-display-image): Ditto.

* net/shr.el (shr-parse-image-data): New function to grab both the
data itself and the Content-Type.
(shr-put-image): Use it.

Fix the Windows build broken by 2013-08-13T15:29:25Z!dmantipov@yandex.ru.

 src/window.c (Fwindow_margins): Return nil when there's no marginal
 area, as per the documented API.
 src/w32term.c (x_scroll_bar_create): Use ALLOCATE_PSEUDOVECTOR, not
 Fmake_vector, as scroll bar's struct members are not all Lisp
 objects now.  This avoids crashes in GC.
 src/w32term.h (struct scroll_bar): Convert fringe_extended_p to a
 bool, so its address could be taken.

merge from trunk

Enable giving hints to ImageMagick via :content-type

2013-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>

* image.el (image-content-type-suffixes): New variable.

2013-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>

* image.c (imagemagick_filename_hint): New function to possibly
apply `image-content-type-suffixes'.
(imagemagick_load_image): Use it.

merge from trunk

merge from trunk

* lisp/progmodes/python.el (python-imenu--build-tree)
(python-imenu--put-parent): Simplify and Fix (GH bug 146).

* test/automated/python-tests.el (python-imenu-create-index-4)
(python-imenu-create-flat-index-2): New tests.

Fail zlib-decompress-region if loading zlib on Windows failed.

 src/decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
 if loading zlib failed.

merge from trunk

Fix NS compile breakage.

* nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by
2013-08-13 checkin below.  Change bool to BOOL, rule is:
All Obj-C code uses BOOL, except for interfaces callable from C.

merge from trunk

* nsterm.h: Fix CGFloat for OSX 10.4.

Fixes: debbugs:15086

* window.h (WINDOW_FRINGE_EXTENDED_P): New macro.
* nsterm.m (ns_set_vertical_scroll_bar): Use it.  Use convenient
bool instead of BOOL.
* w32term.h (struct scroll_bar): Convert fringe_extended_p
from Lisp_Object to bitfield.  Adjust comment.
* w32term.c (x_scroll_bar_create): Adjust user.
Use WINDOW_FRINGE_EXTENDED_P and bool for boolean.
* xterm.c (XTset_vertical_scroll_bar): Likewise.
Use bool for boolean.
* xterm.h (struct scroll_bar): Prefer commonly used `unsigned'
to `unsigned int' when defining a bitfield.

merge from trunk

merge from trunk

* decompress.c (Fzlib_decompress_region): Try to clarify 'avail_out'.

* window.h (struct window): Convert left_margin_cols and
right_margin_cols from Lisp_Objects to integers.  Adjust comment.
(WINDOW_LEFT_MARGIN_COLS, WINDOW_RIGHT_MARGIN_COLS)
(WINDOW_LEFT_MARGIN_WIDTH, WINDOW_RIGHT_MARGIN_WIDTH):
Adjust users.
* dispnew.c (margin_glyphs_to_reserve): Convert 3rd arg to int.
Adjust comment.
(showing_window_margins_p, update_window_line, update_frame_1):
* fringe.c (draw_fringe_bitmap_1):
* xdisp.c (window_box_width): Adjust users.
* window.c (wset_left_margin_cols, wset_right_margin_cols): Remove.
(adjust_window_margins, set_window_buffer, Fsplit_window_internal):
Use direct assignment.
(Fset_window_configuration, save_window_save, Fwindow_margins):
Convert Lisp_Object to integer and back where appropriate.
(Fset_window_margins): Adjust user.  Return t if any margin
was actually changed, and mention this in docstring.

merge from trunk

Doc fix for forward-word and backward-word.

* doc/lispref/positions.texi (Word Motion): Remove redundant sentence.
* lisp/simple.el (backward-word): Mention the optional argument.
* src/syntax.c (forward_word): Mention the optional argument.

* src/cmds.c (forward_char, backward_char): Mention the optional argument.

merge from trunk

* lisp/frameset.el (frameset--make): Rename constructor from make-frameset.
(frameset-p, frameset-valid-p): Don't autoload.
(frameset-valid-p): Use normal accessors.

merge from trunk

* window.h (struct window): Convert left_fringe_width
and right_fringe_width from Lisp_Objects to integers.
Adjust comment.
(WINDOW_FRINGE_COLS, WINDOW_LEFT_FRINGE_WIDTH)
(WINDOW_RIGHT_FRINGE_WIDTH): Adjust users.
* window.c (wset_left_fringe_width, wset_right_fringe_width):
Remove.
(make_window): Initialize new integer fields to -1.
(Fsplit_window_internal): Use direct assignment.
(Fset_window_configuration, save_window_save): Convert
Lisp_Object to integer and back where appropriate.
(Fset_window_fringes): Adjust user.  Return t if any fringe
was actually changed, and mention this in docstring.

merge from trunk

Auto-commit of generated files.