Apply <ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-1.0.tar.gz>.
Apply <ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-24.3.90-mac-4.90-monitor-attributes.patch.gz>.
Mention that overlay priority doesn't have to be nil or an integer.
doc/emacs/ChangeLog: Typo fix.
Minor fixes to the docs.

 doc/emacs/buffers.texi (Uniquify): Clarify the default uniquification.
 doc/emacs/indent.texi (Tab Stops): Improve wording.
 doc/emacs/cmdargs.texi (General Variables): Improve docs of
 EMACSLOADPATH.  Index all the environment variables.
 (Misc Variables): Index all the environment variables.

 doc/lispref/text.texi (Registers): Document register-read-with-preview.
 doc/lispref/internals.texi (Building Emacs): Improve indexing.
Fix freezing with scroll bars of GTK3 Toolkit.
* src/keyboard.c (unblock_input): Add comment.
* src/xgselect.c (xg_select): Prevent Glib main loop recursion.
* lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol):
Don't prettify a word within a symbol.
* net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): Set
"IFS=" when using read builtin, in order to preserve spaces in
the file name.  Add test messages for hunting a bug on hydra.
(tramp-get-ls-command): Undo using "-b" argument.  It doesn't help.
* lisp/emacs-lisp/cl-macs.el (cl--loop-let): Avoid `nil' as var name.
* lisp/dframe.el (dframe-get-focus): Remove `hook' argument.
* lisp/speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead.
* automated/tramp-tests.el (tramp-test30-special-characters):
Remove test for backslash.
* net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
Remove test messages.
(tramp-do-copy-or-rename-file-out-of-band): Do not quote `source'
and `target' twice.
* automated/tramp-tests.el (tramp--test-check-files): Remove traces.
Merge Org 8.2.6-1.

The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
Add debugging facility for the newline cache.
See the discussion in
http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00295.html
for more detail.

 src/search.c (find_newline1): New subroutine.
 (Fnewline_cache_check): New function.
 (syms_of_search): Defsubr it.
* dired.el (dired-insert-set-properties): Do not consider
subdirectory headings and empty lines to be information that
`dired-hide-details-mode' should hide.  (Bug#17228)
* search.c (Fnewline_cache_check): Remove unused locals.
Port to GCC 4.9.0 with --enable-gcc-warnings.

* image.c (struct my_jpeg_error_mgr) [lint]: Remove member fp.
All uses removed.
(jpeg_load_body) [lint]: Add a 'volatile' to pacify a buggy GCC in
a way that also works with GCC 4.9.0.
* lisp/term/xterm.el (xterm--version-handler): Don't use modern xterm
features on gnome-terminal.
Merge branch 'savannah-emacs-24' into emacs-24-mac

Conflicts:
	src/xgselect.c