Updates for compiling with Gtk+ 3.0 (--with-x-toolkit=gtk3).

* configure.in: Require 3.0 for --with-gtk3.  Add HAVE_GTK3.

* doc/emacs/xresources.texi (GTK resources): ~/.emacs.d/gtkrc does not work
for Gtk+ 3.

* src/gtkutil.c: Include gtkx.h if HAVE_GTK3.  If ! HAVE_GTK3, define
gdk_window_get_screen, gdk_window_get_geometry,
gdk_x11_window_lookup_for_display and GDK_KEY_g.
(xg_set_screen): Use DEFAULT_GDK_DISPLAY.
(xg_get_pixbuf_from_pixmap): New function.
(xg_get_pixbuf_from_pix_and_mask): Change parameters from GdkPixmap
to Pixmap, take frame as parameter, remove GdkColormap parameter.
Call xg_get_pixbuf_from_pixmap instead of
gdk_pixbuf_get_from_drawable.
(xg_get_image_for_pixmap): Do not make GdkPixmaps, call
xg_get_pixbuf_from_pix_and_mask with Pixmap parameters instead.
(xg_check_special_colors): Use GtkStyleContext and its functions
for HAVE_GTK3.
(xg_prepare_tooltip, xg_hide_tooltip): Call gdk_window_get_screen.
(xg_prepare_tooltip, create_dialog, menubar_map_cb)
(xg_update_frame_menubar, xg_tool_bar_detach_callback)
(xg_tool_bar_attach_callback, xg_update_tool_bar_sizes): Call
gtk_widget_get_preferred_size.
(xg_frame_resized): gdk_window_get_geometry only takes 5
parameters.
(xg_win_to_widget, xg_event_is_for_menubar): Call
gdk_x11_window_lookup_for_display.
(xg_set_widget_bg): New function.
(delete_cb): New function.
(xg_create_frame_widgets): connect delete-event to delete_cb.
Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
(xg_set_background_color): Call xg_set_widget_bg.
(xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
(xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.
Only call gtk_range_set_update_policy if ! HAVE_GTK3.
(xg_make_tool_item): Only connect xg_tool_bar_item_expose_callback
if ! HAVE_GTK3.
(update_frame_tool_bar): Call gtk_widget_hide.
(xg_initialize): Use GDK_KEY_g.

* src/xmenu.c (menu_position_func): Call gtk_widget_get_preferred_size.

* src/xsmfns.c (gdk_set_sm_client_id): Define to gdk_set_sm_client_id
if ! HAVE_GTK3
(x_session_initialize): Call gdk_x11_set_sm_client_id.

* src/xterm.c (XFillRectangle): Use cairo routines for HAVE_GTK3.
(x_term_init): Disable Xinput(2) with GDK_CORE_DEVICE_EVENTS.
Load ~/emacs.d/gtkrc only for ! HAVE_GTK3.

* src/xterm.h (DEFAULT_GDK_DISPLAY): New define.
(GDK_WINDOW_XID, gtk_widget_get_preferred_size): New defines
for ! HAVE_GTK3.
(GTK_WIDGET_TO_X_WIN): Use GDK_WINDOW_XID.

texinfo.el addition for bug#2783.

* lisp/textmodes/texinfo.el (texinfo-environments):
Add deftypecv, deftypeivar, deftypemethod, deftypeop, html.

cus-start.el fix for bug#8192.

* lisp/cus-start.el (cursor-in-non-selected-windows):
Fix :set quoting oddness.

Doc fix for bug#8193.

* doc/emacs/display.texi (Optional Mode Line): Don't mention exactly
where display-time appears (it was wrong anyway).

font-lock.el tweak for bug#2159.

* lisp/font-lock.el (lisp-font-lock-keywords-1):
Don't highlight `)' in some setf expressions.

* lisp/custom.el (custom-available-themes): Return themes in alphabetical order.

* etc/themes/wombat-theme.el: New file.

Also, add Lisp file tails to tsdh-*-theme.el.

src/w32xfns.c (select_palette): Check success of RealizePalette against GDI_ERROR, not zero.

Mention elpa branch in admin/notes/BRANCH; clarify admin/notes/elpa.

Remove unnecessary "(tiny change)" markers.

Fix bug#8181.

* src/w32fns.c (FILE_NAME_COMBO_BOX, FILE_NAME_LIST): Define.
  (file_dialog_callback): Fix locating the window handle of the File Name
  text field.  After disabling it, set focus on the list control.
  (Fx_file_dialog): If only_dir_p is non-nil, set the text of the File
  Name text field to "Current Directory" if it does not already have
  another value.

Fix a cc-cmds.el patch from acm that I applied incorrectly (Bug#7595).

* lisp/progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect
application of patch from Alan Mackenzie (Bug#7595).

* lisp/net/rcirc.el (rcirc-connect): Fix PASS bug.

* nsterm.m (ns_draw_window_cursor): Fix handling of 'cursor_width' parameter for hbar cursors.  Based on a patch by Ben Key <bkey76@gmail.com>.

vc.el fix for bug#6146.

* lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
Give an explicit error if failed to make writable.

* lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.

cal-hebrew addition from bug#8190.

* lisp/calendar/cal-hebrew.el (diary-hebrew-yahrzeit):
Add optional `after-sunset' argument.

* etc/NEWS: Mention nato-region.

* lisp/play/morse.el (morse-region, unmorse-region): Barf if read-only.

morse.el additions from bug#2288.

* lisp/play/morse.el (nato-alphabet, nato-region, denato-region):
New variable and functions.

Revert incorrect logic in 2011-03-06T07:50:01Z!eggert@cs.ucla.edu.

* src/xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 change.

Document package archives in the Lisp manual.

* doc/lispref/package.texi: Update index keywords.
(Package Archives): New node contents.  Document package-x.el.

* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function):
Don't change the syntax of a \n that closes a comment.

Fixes: debbugs:8169

Usability improvements to commands in package-x.el.

* lisp/emacs-lisp/package-x.el (package-archive-upload-base): Make it a
defcustom.
(package--update-file): Doc fix.  Accept relative file names.
(package--archive-contents-from-file): Remove the argument, since
it's necessarily always "archive-contents".
(package-maint-add-news-item): Pass relative file name args to
package--update-file.
(package-upload-buffer-internal): Prompt for a destination if
package-archive-upload-base is invalid.  Create the directory if
it does not exist.
(package-upload-buffer, package-upload-file): Doc fix.

doc/lispref/makefile.w32-in (srcs): Add package.texi.

Bind C-y in Isearch to isearch-yank-kill.

* lisp/isearch.el (isearch-mode-map): Bind C-y to isearch-yank-kill,
and move isearch-yank-line to M-s C-e.

* doc/emacs/search.texi (Isearch Yank): C-y now bound to isearch-yank-kill.

(c-guess-basic-syntax): Move CASE 19 to a different place, correctly to
process template-args-cont lines.

progmodes/cc-engine.el (c-guess-basic-syntax): Reindent.

Improve packaging documentation.

* package.texi (Packaging, Packaging Basics, Simple Packages)
(Multi-file Packages): Expand and clarify.
(Package Archives): Temporary placeholder node.

* elisp.texi (Top): Update node listing.

Merge: current_column: Now returns EMACS_INT, fixing some iftc
that was introduced in the 2002-06-02 change "temporarily"; see
<http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here
from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.
* xdisp.c (redisplay_window): Reindent to match Emacs style.

current_column: Now returns EMACS_INT, fixing some iftc.

* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.

* xdisp.c (redisplay_window): Likewise.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here

from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.

* cmds.c (internal_self_insert): Reindent to match Emacs style.

* xdisp.c (SKIP_GLYPHS): Removed unused macro.

* xdisp.c (update_window_cursor):  Now static, since it's not used elsewhere.

* xdisp.c (produce_glyphless_glyph): Make a pointer "const"

since it might point to immutable storage.

* xdisp.c (BUILD_GLYPHLESS_GLYPH_STRING): Omit unused local var.

Merge from mainline.

* xdisp.c: Rename or move local decls to avoid shadowing.

(init_iterator, handle_fontified_prop, handle_single_display_spec):
(message_dolog, message_with_string, redisplay_internal):
(redisplay_window, try_window_reusing_current_matrix, try_window_id):
(compute_line_metrics, highlight_trailing_whitespace, cursor_row_p):
(display_line, display_string, rows_from_pos_range):
(mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
Rename or move local decls.

Add package.texi to doc/lispref/Makefile.in.

* calc/calc-units.el (math-midi-round): Translate calc-note-threshold
  to an appropriate fraction.

* calc/calc-units.el (math-midi-round, math-freqp, math-midip)
  (math-spnp, math-spn-to-midi, math-midi-to-spn, math-freq-to-spn)
  (math-midi-to-freq, math-spn-to-freq, calcFunc-spn, calcFunc-midi)
  (calcFunc-freq, calc-freq, calc-midi, calc-spn): New functions.
  (math-notes): New variable.

* calc/calc.el (calc-note-threshold): New variable.

* calc/calc-ext.el (calc-init-extensions): Add keybindings for
  calc-spn, calc-midi, calc-freq.  Add autoloads for calcFunc-spn,
  calcFunc-midi, calcFunc-freq, calc-spn, calc-midi and calc-freq.

* doc/misc/calc.tex (Musical Notes): New section.
  (Customizing Calc): Mention calc-note-threshold.

* doc/misc/calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-ext.el (calc-init-extensions): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-units.el (calc-dblevel): Rename from calc-logunits-dblevel.
  (calc-nplevel): Rename from calc-logunits-nplevel.

Allow specifying local ELPA mirrors in package-archives.

* emacs-lisp/package.el (package-archives): Accept either ordinary
directory names, in addition to HTTP URLs.
(package--with-work-buffer): New macro.   Handle normal directories.
(package-handle-response): Don't display the failing buffer.
(package-download-single, package-download-tar)
(package--download-one-archive): Use package--with-work-buffer.
(package-archive-base): Rename from package-archive-url.

Mention xmodmap-generic-mode in NEWS.

generic-x trivia.

* lisp/generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
(xmodmap-generic-mode): Respect generic-extras-enable-list.

* lisp/generic-x.el (xmodmap-generic-mode): New.  (Bug#2065)  (tiny change)

Fix typos.

* etc/srecode/el.srt: Fix typo.

* lisp/allout.el (allout-init, allout-prefixed-keybindings)
  (allout-unprefixed-keybindings):
* lisp/progmodes/prolog.el (prolog-find-term):
  Fix typos in docstrings.

* lisp/org/org.el (org-blank-before-new-entry, org-context-in-file-links)
  (org-refile-targets, org-log-repeat, org-insert-link)
  (org-speed-command-default-hook, org-speed-command-hook)
  (org-in-regexps-block-p, org-yank-generic, org-goto-first-child):
  Fix typos in docstrings.
  (org-toggle-pretty-entities): Fix typo in message.

* lisp/emacs-lisp/elp.el (elp-results): Fix off-by-one in header.  (Bug#2746)

* lisp/textmodes/sgml-mode.el (sgml-fill-nobreak): Give it a doc.  (Bug#5326)

Doc fixes for bug#5567 (tiny change)

* lisp/window.el (one-window-p, walk-windows, display-buffer): Doc fixes.
* src/window.c (Fnext_window): Doc (and comment) fixes.

* cus-edit.el (custom-prompt-variable):  Use the `custom-get' property
  of the variable if it exists.

NEWS.

Regenerate autotools stuff, grumble.

* configure.in (FREETYPE_LIBS): Actually set it to something.

This was needed for linking a lucid toolkit build on a recent
Debian testing system.  Without this, it failed with:
ftfont.o: undefined reference to symbol 'FT_New_Face'

* lisp/bookmark.el:
* lisp/desktop.el:
* lisp/emacs-lock.el:
* lisp/ps-print.el:
* lisp/saveplace.el:
* lisp/net/tramp-cache.el:
* lisp/textmodes/reftex.el:
* lisp/org/org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.

Fixes: debbugs:8137

gnus-uu.el (gnus-uu-decode-save): Typo fix.

Fix last change.

* nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.

Remove "tiny change" ChangeLog tags for Antoine Levitt, who signed papers.

Replace many instances of read-file-name with read-directory-name.

* lisp/files.el (delete-directory, copy-directory, list-directory): Use
read-directory-name.

* lisp/find-file.el (ff-find-the-other-file):
* lisp/net/ange-ftp.el (ange-ftp-make-directory):
* lisp/printing.el (pr-interactive-dir):
* lisp/progmodes/ada-prj.el (ada-prj-load-directory):
* lisp/progmodes/ebnf2ps.el (ebnf-print-directory)
(ebnf-spool-directory, ebnf-eps-directory)
(ebnf-syntax-directory):
* lisp/shell.el (shell):
* lisp/speedbar.el (speedbar-create-directory):
* lisp/vc/emerge.el (emerge-merge-directories):
* lisp/vc/vc-dir.el (vc-dir):
* lisp/vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise.

* lisp/gnus.el (gnus-interactive): Use read-directory-name.

* lisp/gnus-uu.el (gnus-uu-decode-uu-and-save)
(gnus-uu-decode-unshar-and-save, gnus-uu-decode-save)
(gnus-uu-decode-binhex, gnus-uu-decode-yenc)
(gnus-uu-decode-save-view, gnus-uu-decode-postscript-and-save):
Likewise.

* lisp/mh-funcs.el (mh-store-msg, mh-store-buffer):
* lisp/mh-mime.el (mh-mime-save-parts): Use read-directory-name.

* lisp/dired.el: Clarify comment.

Fix to help-buffer to ensure it returns a valid buffer (Bug#8147).

* lisp/help-mode.el (help-buffer): If we are to return the current
buffer, signal an error if it's not in Help mode.

* processes.texi (Synchronous Processes): Minor clarification (Bug#8149).

Add ChangeLog bug ref.

Handle git-style backup names in file-name-version-regexp (Bug#8159).

* files.el (file-name-version-regexp): Handle backup files of the
form `foo.js.~HEAD~1~' (Bug#8159).

ChangeLog fix.

Move eshell's self-tests to the test/ directory.

* lisp/eshell/esh-var.el: Don't require esh-test when compiling.
* lisp/eshell/em-banner.el, lisp/eshell/esh-cmd.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-var.el, lisp/eshell/eshell.el: Move tests to esh-test.
* lisp/eshell/esh-test.el: Move to ../../test/eshell.el

* test/eshell.el: Move here from lisp/eshell/esh-test.el.

Make save-some-buffers message more informative (Bug#8134).

* files.el (save-some-buffers): Report the names of buffers saved
automatically due to buffer-save-without-query.

* lisp/eshell/esh-proc.el (eshell-kill-process-function): Fix typo in previous.

* lisp/net/rcirc.el: Add QuakeNet authentication support.
(rcirc-authinfo, rcirc-check-auth-status)
(rcirc-authenticate): Support QuakeNet.

* lisp/net/rcirc.el: Add functionality to authenticate before autojoining channels.
(rcirc-authenticate-before-join): New option.
(rcirc-authenticated-hook): New variable.
(rcirc-connect): Make local variable rcirc-user-authenticated.
(rcirc-handler-001): Respect rcirc-authenticate-before-join.
(rcirc-check-auth-status, rcirc-join-channels-post-auth): New
functions.
(rcirc-handler-PRIVMSG, rcirc-handler-NOTICE): Call
rcirc-check-auth-status.

Merge changes made in Gnus trunk.

gnus-sum.el (gnus-update-read-articles): Fix typo.
gnus.el (gnus-valid-select-methods): Mark nnimap as a backend that really have server-side marks.
gnus-sum.el (gnus-propagate-marks): Change default back to nil again, since most backends do not usefully have server-side marks.
 (gnus-update-read-articles): Propagate marks to all backends that really have server-side marks.
message.el (message-cite-reply-position, message-cite-style): New variables.
 (message-yank-original): Use the new citation styles.

Add package name. Fix author email address.

* net/soap-client.el (soap-namespace-put-link): Check if the target
name is fully qualified -- use only the name part.
(soap-parse-complex-type, soap-parse-sequence): Recognize xsd:all
types, treated the same as xsd:sequence.  (Bug#8166)

Fix bug #8177 with re-visiting image files.

 files.el (find-file-noselect): Don't ask about re-visiting
 non-literally if the file is already visited in image-mode.

esh-util.el comment fix.

Default all eshell hooks to nil (bug#5375)

* eshell/esh-mode.el (eshell-kill-buffer-function): New function.
(eshell-mode): Use eshell-kill-buffer-function.
Run the -initialize functions independently of the -load-hooks.
* eshell/esh-proc.el (eshell-kill-process-function): New function.
(eshell-gather-process-output, eshell-sentinel)
(eshell-interrupt-process, eshell-kill-process, eshell-quit-process):
Use eshell-kill-process-function.
* eshell/em-alias.el (eshell-alias-load-hook):
* eshell/em-banner.el (eshell-banner-load-hook):
* eshell/em-cmpl.el (eshell-cmpl-load-hook):
* eshell/em-dirs.el (eshell-dirs-load-hook):
* eshell/em-glob.el (eshell-glob-load-hook):
* eshell/em-hist.el (eshell-hist-load-hook):
* eshell/em-pred.el (eshell-pred-load-hook):
* eshell/em-prompt.el (eshell-prompt-load-hook):
* eshell/em-rebind.el (eshell-rebind-load-hook):
* eshell/em-script.el (eshell-script-load-hook):
* eshell/em-smart.el (eshell-smart-load-hook):
* eshell/em-term.el (eshell-term-load-hook):
* eshell/em-unix.el (eshell-unix-load-hook):
* eshell/esh-arg.el (eshell-arg-load-hook):
* eshell/esh-cmd.el (eshell-cmd-load-hook):
* eshell/esh-ext.el (eshell-ext-load-hook):
* eshell/esh-io.el (eshell-io-load-hook):
* eshell/esh-mode.el (eshell-exit-hook):
* eshell/esh-proc.el (eshell-proc-load-hook, eshell-kill-hook):
* eshell/esh-var.el (eshell-var-load-hook):
Set default hook values to nil.  (Bug#5375)

esh-module doc fixes.

* lisp/eshell/esh-module.el (eshell-module-unload-hook)
(eshell-modules-list): Remove leading * from defcustom docs.

message.el (message-options): Don't mark it buffer-local when running under XEmacs.

Make eshell-for obsolete (replaced by dolist)

* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.

* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0.  (Bug#8170)

* progmodes/gud.el (gdb-script-mode): Derive from prog-mode.

message.el (message-options): Revert the change that's a workaround for XEmacs buffer-local issue.

outline.el fix for bug#7619.

It turns out the use of nil in the :type of outline regexp was for
very hysterical raisons.  Prior to 2001-09-12T20:42:08Z!rms@gnu.org, the
default value was nil, then it was initialized afterwards.
Everywhere in the code assumes it cannot be nil, so no need to allow
that any more.

* lisp/outline.el (outline-regexp): No longer allow nil.
(outline-heading-end-regexp): Add safety predicate.

browse-url fix for bug#6077.

* lisp/net/browse-url.el (browse-url): Handle deleted default-directory.

recentf.el fix for bug#5843.

* lisp/recentf.el (recentf-include-p): In case of a buggy predicate,
err on the side of including, not excluding.

* lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)

* calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
  variables as units.

Minor ewoc fix for bug#3261.

* lisp/emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error
if there is no node.

* lisp/erc/erc-track.el (erc-track-visibility): Fix :type.  (Bug#6369)

* lisp/time.el (display-time-world-list): Fix typo.

Fixes: debbugs:7571

ChangeLog fixes.

lisp/cus-edit.el (custom-buffer-create-internal): Fix bug#8136.
Split search string before passing it to `customize-apropos'.

lisp/image-dired.el (image-dired-cmd-read-exif-data-options): Fix typo.

Fixes: debbugs:8156

Fixing old typo.

* lisp/net/rcirc.el (rcirc-cmd-join): Accept comma-separated input.

Merge changes made in Gnus trunk.

nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with numbers too big to be `read'.
password-cache.el (password-in-cache-p): Add autoload.
message.el (message-options): Make buffer-local two ways to attempt to fix a XEmacs bug.

Merged an ERT fix and a speedup.

Added fast path to ERT explanation of `equal'.
* emacs-lisp/ert.el (ert--explain-equal): New function.
(ert--explain-equal-rec): Renamed from `ert--explain-not-equal'.
All callers changed.
(ert--explain-equal-including-properties): Renamed from
`ert--explain-not-equal-including-properties'.  All callers
changed.
* automated/ert-tests.el (ert-test-explain-not-equal-keymaps):
New test.

ediff-init.el fix for bug#1821. (tiny change)

Tiny change; note that author said he placed it in the public domain.
(If this wasn't a tiny change, we would still need paperwork.)

* lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
Move ediff-defvar-local calls after defcustoms.