* gnus-util.el (gnus-message-with-timestamp-1): Use format-time-string

rather than decoding time stamps by hand.  This is simpler, and
insulates the code from changes to time stamp formats.

* lisp/erc/erc.el: Fix comment.

* emacs-lisp/timer.el (timer-relative-time): Use time-add.

* emacs-lisp/elp.el (elp-elapsed-time): Use float-time.

* emacs-lisp/benchmark.el (benchmark-elapse): Use float-time.

* semantic.el (semantic-elapsed-time): Rewrite using

time-subtract and float-time.

* calendar/timeclock.el (timeclock-seconds-to-time):

Defalias to seconds-to-time, since they're the same thing.

* allout-widgets.el (allout-elapsed-time-seconds): Use float-time.

mml2015.el (mml2015-use): Replace string-match-p with string-match for old Emacsen.

textmodes/flyspell.el (flyspell-word): Consider words that differ only
in case as potential doublons (bug#5687).

* net/soap-client.el (soap-invoke, soap-wsdl-resolve-references):
Remove two rather uninteresting debugging-like messages to make
debbugs.el more silent.

* comint.el (comint-password-prompt-regexp): Accept "Response" as
a password-like phrase.

This fixes the

[larsi@quimbies ~/]$ ssh root@quimby
Password:
Response:

case.

gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Take an optional quit window configuration.
auth-source.el (epg-context-set-passphrase-callback): Remove duplicate autoload.
nnir.el (nnir-request-article): Allow requesting articles by Message-ID with nnimap.
gnus-sum.el (gnus-refer-article-methods): Allow (nnir) entry to use current server.
auth-source.el: Autoload EPA/EPG functions.
 (auth-source-netrc-use-gpg-tokens): Clarify that it should not be changed when EPA/EPG is not available.
 (auth-source-backend): Rename "arg" member to "data".
 (auth-source-backend-parse, auth-source-plstore-search)
 (auth-source-plstore-create): Use it.

Prevent Gnus from loading PGG.

* mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
is not fully working.

progmodes/cc-guess.el: New file.
progmodes/cc-langs.el (c-mode-menu): Added "Style..." submenu.
progmodes/cc-styles.el (cc-choose-style-for-mode): New function derived
from `c-basic-common-init'.
progmodes/cc-mode.el (top-level): Require cc-guess.
(c-basic-common-init): Use `cc-choose-style-for-mode'.

* lisp/progmodes/js.el (js-mode): Don't stomp on global settings.

Fixes: debbugs:8933

progmodes/cc-engine.el (c-guess-continued-construct): Correct the
handling of template-args-cont, particularly for when font lock is
disabled.  Name this case as "CASE G".

Fix bad include.

* xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.

* allout.el (allout-yank-processing): Fix injection of extra space between
bullet and non-whitespace character in first topic when pasting, ensuring
that the actual spacing in the pasted topic following the bullet char is
preserved.  This extra space was causing pasted encrypted topics to get a
decrypted status even when the content was actually still encrypted.  Now
the decryption status from before the paste is preserved.

(allout-flag-region): Set all allout overlays so they evaporate when
reduced to zero length (evanescent), to prevent overlay leakage.

* configure.in (HAVE_GSETTINGS): Fix syntax for GSETTINGS tests, which made ./configure infloop.

Merge changes made in Gnus trunk.

gnus-art.el (gnus-request-article-this-buffer): Use existing function `gnus-refer-article-methods'.
auth-source.el: Require EPA and EPG.
 (auth-source-passphrase-alist): New variable.
 (auth-source-passphrase-callback-function, auth-source-token-passphrase-callback-function): Callbacks for the netrc field encryption (GPG tokens).
 (auth-source-epa-extract-gpg-token, auth-source-epa-make-gpg-token): Symmetric encryption and decryption of the netrc GPG tokens.
 (auth-source-netrc-normalize): Use them, simplifying the closure.

Add GSettings support (GConf is going away).

* configure.in (gsettings): New option and check for GSettings.

* src/Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Renamed from
GCONF_CFLAGS/LIBS.

* src/xsettings.c: Include glib.h if HAVE_GSETTINGS.
Let HAVE_GSETTINGS override HAVE_GCONF.
(store_monospaced_changed): New function.
(EMACS_SETTINGS): A new type derived from GObject to handle
GSettings notifications.
(emacs_settings_constructor, emacs_settings_get_property)
(emacs_settings_set_property, emacs_settings_class_init):
New functions.
(gsettings_client, gsettings_obj): New variables.
(GSETTINGS_SCHEMA): New define.
(something_changedCB): Call store_monospaced_changed.
(init_gsettings): New function.
(xsettings_initialize): Call init_gsettings.
(syms_of_xsettings): Initialize gsettings_client, gsettings_obj
to NULL.

nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, and `nnimap-split-methods' is nil, use the former.

Fix the last commit, do revert-buffer when plstore-revert.

Add plstore-revert, hide buffer from user.

* plstore.el (plstore-revert): New function.
(plstore-open): Use it; hide the buffer from user.

Silence auth-source.el compilation.

Add new auth-source backend 'plstore.

* auth-source.el (auth-source-backend): New member "arg".
(auth-source-backend-parse): Handle new backend 'plstore.
* plstore.el: New file.

nnimap.el (nnimap-process-expiry-targets): Say what target we're expiring articles to.

* lisp/w32-fns.el (w32-charset-info-alist): Declare.

* lisp/find-dired.el (find-grep-options): Simplify.

* lisp/gnus/gnus-fun.el (gnus-convert-image-to-x-face-command): Doc fix.

Add bug ref to ChangeLog.

ChangeLog fix.

* etc/TODO: Remove some things that got to-done.

* lisp/term/ns-win.el (ns-set-resource): Declare.

* lisp/gnus/mm-util.el (mm-charset-synonym-alist): Move definition before use.

* lisp/ses.el (row, col): Declare dynamic variables honestly.

Silence reftex-parse compilation.

* lisp/textmodes/reftex-parse.el (index-tags): Declare.
Nuke trailing whitespace.

(thing-at-point-short-url-regexp): Require that short URLs have at least one dot in them (bug #7614).

mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4 variations as ASCII (bug#5458).

Avoid calling customize-save-variable during startup (Bug#8720).

* lisp/cus-edit.el (customize-push-and-save): New function.

* lisp/files.el (hack-local-variables-confirm): Use it.

* lisp/custom.el (load-theme): New arg NO-CONFIRM.  Use
customize-push-and-save (Bug#8720).
(custom-enabled-themes): Doc fix.

* lisp/cus-theme.el (customize-create-theme)
(custom-theme-merge-theme): Callers to load-theme changed.

nnmh.el (nnmh-request-list-1): Work on MS Windows.

(rgrep): Bind `process-connection-type' to nil, because using a pty is apparently too slow (bug #895).

Merge changes made in Gnus trunk.

message.el (message-point-in-header-p): Tweak the function to default to saying that we're not in the headers if there is no separator at all.  This makes it possible to use the Message version of `M-q' in buffers with no headers (bug#7987).
 (message-point-in-header-p): Fix last checkin to work with an empty mail-header-separator, too.
auth-source.el (auth-source-netrc-saver): If the user says "don't ask again, save the choice via customize.
message.el (message-send-mail-function): Add `sendmail-query-once'.
nnimap.el (nnimap-finish-retrieve-group-infos): If the server has ended the connection, bail out before waiting infinitely on a new connection.

Add the new `sendmail-query-once' function to sendmail.el.

* lisp/files.el (auto-mode-alist): Add .f03, .f08 for f90-mode.

Silence ses.el compilation.

* lisp/ses.el (top-level): Require cl when compiling.
(ses-set-localvars): Fix error statement.
Call it at compile time to silence a storm of warnings.

Rename more functions to use window-/window-- prefixes.

* window.c (resize_root_window, grow_mini_window)
(shrink_mini_window): Rename Qresize_root_window to
Qwindow_resize_root_window and Qresize_root_window_vertically to
Qwindow_resize_root_window_vertically.

* window.el (normalize-live-buffer): Rename to
window-normalize-buffer.
(normalize-live-frame): Rename to window-normalize-frame.
(normalize-any-window): Rename to window-normalize-any-window.
(normalize-live-window): Rename to window-normalize-live-window.
(make-window-atom): Rename to window-make-atom.
(window-resize-reset): Rename to window--resize-reset.
(window-resize-reset-1): Rename to window--resize-reset-1.
(resize-mini-window): Rename to window--resize-mini-window.
(resize-subwindows-skip-p): Rename to
window--resize-subwindows-skip-p.
(resize-subwindows-normal): Rename to
window--resize-subwindows-normal.
(resize-subwindows): Rename to window--resize-subwindows.
(resize-other-windows): Rename to window--resize-siblings.
(resize-this-window): Rename to window--resize-this-window.
(resize-root-window): Rename to window--resize-root-window.
(resize-root-window-vertically): Rename to
window--resize-root-window-vertically.
(normalize-buffer-to-display): Rename to
window-normalize-buffer-to-display.
(normalize-buffer-to-switch-to): Rename to
window-normalize-buffer-to-switch-to.
Correspondingly update all callers of the functions listed
above.
(display-buffer-alist, display-buffer-normalize-arguments)
(display-buffer-normalize-options, display-buffer)
(display-buffer-alist-set): Use "function" instead of
"fun-with-args".

Auto-commit of generated files.

* configure.in: Do not override user crt-dir, even if faulty.

* configure.in: Tweak previous change.

* configure.in: Try to test for the required crt*.o files.

Merge changes made in Gnus trunk.

gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug reports.
gnus.el (gnus-bug-package): Use "gnus."
 (gnus-maintainer): Direct bug reports to submit@debbugs.gnu.org.

Tweaks to the report-emacs-bug preamble.

* mail/emacsbug.el (report-emacs-bug): Handle non-gnu bug
addresses more clearly.  Add hyperlinks for bug-gnu-emacs and
debbugs.gnu.org.  Mention acknowledgment email.

* gnutls.c (Qgnutls_bootprop_verify_error): Remove unused var.

(smtpmail-send-it): Leave off changing the buffer multibyteness, since it shouldn't matter.

Some more fixes of buffer display functions.

* window.el (display-buffer-in-side-window): Handle dedicated
windows as in display-buffer-reuse-window.
(display-buffer-normalize-alist): Use value of override
specifier.
(display-buffer-normalize-specifiers): Use value of
other-window-means-other-frame specifier.
(display-buffer-alist): Rewrite some texts in widgets.
(display-buffer): Spread arguments when calling function
specified by fun-with-args.

* emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): Unnest `let'.

* textmodes/css-mode.el (css-proprietary-nmstart-re): Use `regexp-opt'.

* textmodes/css-mode.el (css-font-lock-keywords): Fix grouped selectors.

Fixes: debbugs:5732

* doc/misc/rcirc.texi (Configuration): Bug-fix: `rcirc-default-user-full-name' is now `rcirc-default-full-name'. Reported by Elias Pipping <pipping@exherbo.org>.

* eshell/em-ls.el: Display `ls -l' dates in ISO format (Bug#8440).
(eshell-ls-date-format): New defcustom.
(eshell-ls-file): Use it.

* lisp/help-fns.el (describe-variable): Fix message for terminal-local vars.

* lisp/net/ange-ftp.el: Allow loading .gz files (Bug#6923).
(ange-ftp-make-tmp-name): New arg.
(ange-ftp-file-local-copy): Use it.

Remove incorrect ChangeLog entry from last commit.

Coding system fix for tar-untar-buffer (Bug#8870).

* lisp/tar-mode.el (tar-untar-buffer): Set coding-system-for-write
to no-conversion.

Use window- prefix more consistently.  Fix two buffer display bugs.

* window.c (resize_window_check): Rename to window_resize_check.
(resize_window_apply): Rename to window_resize_apply.
(Fresize_window_apply): Rename to Fwindow_resize_apply.
(Fdelete_other_windows_internal, resize_frame_windows)
(Fsplit_window_internal, Fdelete_window_internal)
(grow_mini_window, shrink_mini_window)
(Fresize_mini_window_internal): Fix callers accordingly.

* window.el (resize-window-reset): Rename to window-resize-reset.
(resize-window-reset-1): Rename to window-resize-reset-1.
(resize-window): Rename to window-resize.
(window-min-height, window-min-width)
(resize-mini-window, resize-this-window, resize-root-window)
(resize-root-window-vertically, adjust-window-trailing-edge)
(enlarge-window, shrink-window, maximize-window)
(minimize-window, delete-window, quit-restore-window)
(split-window, balance-windows, balance-windows-area-adjust)
(balance-windows-area, window-state-put-2)
(display-buffer-even-window-sizes, display-buffer-set-height)
(display-buffer-set-width, set-window-text-height)
(fit-window-to-buffer): Rename all "resize-window" prefixed
calls to use the "window-resize" prefix convention.
(display-buffer-alist): Fix symbol for label specifier.
(display-buffer-reuse-window): Set reuse-dedicated to cdr of
corresponding specifier.
Reported by Juanma Barranquero <lekktu@gmail.com>.

src/makefile.w32-in: Redesign dependencies.

Use better names for window-next/-prev and window-vchild/-hchild.

* window.c (Fwindow_vchild): Rename to Fwindow_top_child.
(Fwindow_hchild): Rename to Fwindow_left_child.
(Fwindow_next): Rename to Fwindow_next_sibling.
(Fwindow_prev): Rename to Fwindow_prev_sibling.

* window.el (window-right, window-left, window-child)
(window-child-count, window-last-child)
(window-iso-combination-p, walk-window-tree-1)
(window-atom-check-1, window-tree-1, delete-window)
(window-state-get-1, display-buffer-even-window-sizes): Adapt to
new naming conventions - window-vchild, window-hchild,
window-next and window-prev are now called window-top-child,
window-left-child, window-next-sibling and window-prev-sibling
respectively.

Auto-commit of loaddefs files.

Have overlays with window property respect clone numbers.

* buffer.c (Qclone_number): Declare static and DEFSYM it.
(sort_overlays, overlay_strings): When an overlay's clone number
matches the window's clone number process the overlay even if
the overlay's window property doesn't match the current window.

(ses-destroy-cell-variable-range): Fix heading comment convention.
(ses-call-printer): Does not pass an empty string to formatter when the cell is empty to keep from barking printer Calc math-format-value.

Implement battery-mode-line-limit option.

rmailmm: Handle truncated messages.

flymake.el fix for bug#8866.

* lisp/progmodes/flymake.el (flymake-err-line-patterns):
Allow for column numbers in the ant/javac pattern.

Update default value of `vc-revert-show-diff'.

(ses-relocate-range): Keep rest of arguments for ses-range.
(ses--clean-!, ses--clean-_): New functions.
(ses-range): Add configurability of readout order, and conversion to Calc vector.

(ses-repair-cell-reference-all): New function.
(ses-cell-symbol): Set macro as safe, so that it can be used in
formulas.

Update cycle detection algorithm.
(ses-localvars): Add ses--Dijkstra-attempt-nb and
ses--Dijkstra-weight-bound, and initial values thereof when
applicable.
(ses-set-localvars): New function.
(ses-make-cell): Add property-list as a cell element.
(ses-cell-property-get-fun, ses-cell-property-get)
(ses-cell-property-delq-fun, ses-cell-property-set-fun)
(ses-cell-property-pop-fun, ses-cell-property-get-handle-fun): New
functions.
(ses-cell-property-set, ses-cell-property-pop)
(ses-cell-property-get-handle): New macro.
(ses-cell-property-handle-car, ses-cell-property-handle-setcar):
New aliases, used for code readability.
(ses-calculate-cell, ses-update-cells): Use Dijkstra algorithm for
cycle detection.
(ses-self-reference-early-detection): New defcustom.
(ses-formula-references): Robustify against self-refering cells.
(ses-mode): Use ses-set-localvars.
(ses-command-hook): Add call to ses-initialize-Dijkstra-attempt
before lauching the update processing.
(ses-initialize-Dijkstra-attempt): New function.
(ses-recalculate-cell): Update for cycle detection based on
Dijkstra algorithm.

Fix commenting and indenting convention.

* .bzrignore: Add lisp/mh-e/mh-autoloads.el and lisp/mh-e/mh-cus-load.el.

lwlib/Makefile.in (ALL_CFLAGS): Add -I../lib for generated header files in out-of-tree build.

* lisp/bs.el (bs-cycle-next): Complete last change.

Fix typos in lisp/ChangeLog.

lisp/faces.el (list-faces-display): Add help-mode-map to output.

Fixes: debbugs:8939

Fix stupid typo with gnutls-clii.
Don't re-get capabilities unless we're reconnecting.

Bind coding-system-for-* to binary to possibly avoid line encoding
issues on Windows (among other things).

Merge changes made in Gnus trunk.

gnus-art.el (gnus-article-stop-animations): New function to stop any animations going on at article exit time.
gnus-registry.el (gnus-registry-user-format-function-M): Reinstate, since removing it breaks people upgrading.
shr.el (shr-put-image): Use the new interface for animating images.
 (shr-put-image): Animate for 60 seconds.

If the SMTP server supports STARTTLS, but Emacs has no built-in or
external STARTTLS support, then report this in a sensible fashion to
the user.

Add global-hl-line-sticky-flag (Bug#8323).

* lisp/hl-line.el (hl-line-sticky-flag): Doc fix.
(global-hl-line-sticky-flag): New option.
(global-hl-line-highlight): Obey it.

* lisp/vc/vc.el (vc-revert-show-diff): Default to t.

Fix wm_size-hints race between KDE/KWin and Gtk+ 3.

* emacsgtkfixed.c: State that this is only used with Gtk+3.
(_EmacsFixedPrivate): Remove minwidth/height.
Add struct frame *f.
(emacs_fixed_init): Initialize priv->f.
(get_parent_class, emacs_fixed_set_min_size): Remove.
(emacs_fixed_new): Set priv->f to argument.
(emacs_fixed_get_preferred_width)
(emacs_fixed_get_preferred_height): Use min_width/height from
frames size_hint to set minimum and natural.
(XSetWMSizeHints, XSetWMNormalHints): Override these functions
and use min_width/height from frames size_hint to set
min_width/height (Bug#8919).

* emacsgtkfixed.h: State that this is only used with Gtk+3.
(emacs_fixed_set_min_size): Remove.
(emacs_fixed_new): Take frame as argument.

* gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
(x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix
indentation.

ChangeLog fix.

Avoid bidi-related crashes in Cperl Mode.

 src/bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling
 bidi_at_paragraph_end, since fast_looking_at doesn't like to be
 called at ZV.

* allout-widgets.el (allout-widgets-post-command-business): Stop decorating
intermediate isearch matches.  They're not being undecorated when an
isearch is continued past, and isearch automatically collapses them.  This
leads to "widget leaks", where decorated items accumulate in collapsed
areas.  Lines with lots of hidden widgets can slow down cursor travel,
substantially.  Too much complicated machinery would be needed to ensure
undecoration, so we're doing without this nicety.

(allout-widgets-tally-string): Don't try to do a hash-table-count of
allout-widgets-tally when it's nil.  This eliminates spurious "Error during
redisplay: (wrong-type-argument hash-table-p nil)" warnings in *Messages*
when allout-widgets-maintain-tally is t.

Fix some more display-buffer related bugs.

* window.el (display-buffer-normalize-argument): Rename to
display-buffer-normalize-arguments.  Handle special meaning of
LABEL argument.  Respect special-display-function when popping
up a new frame.  Fix code searching for a window showing the
buffer on another frame.
(display-buffer-normalize-specifiers): Call
display-buffer-normalize-arguments.
(display-buffer-in-window): Don't undedicate the window if its
buffer remains the same.
Reported by Drew Adams <drew.adams@oracle.com>.
(display-buffer-alist): Add choice for same-window macro
specfier.
(display-buffer): Mention special meaning of LABEL argument in
doc-string.  Fix quoting.  Don't pop up a new frame even as
fallback.

Merge changes made in Gnus trunk.

gnus.texi (Summary Mail Commands): Document `gnus-summary-reply-to-list-with-original'.
auth-source.el (with-auth-source-epa-overrides): Fix compilation error with `find-file-hooks' on Emacs 22.
 (with-auth-source-epa-overrides): Ugly hack to Wrap the `find-file-hook' things in `symbol-value' to avoid compilation warnings on all architectures.
spam.el (spam-stat): Require in a normal fashion without binding `spam-stat-install-hooks' to avoid compilation warnings.
spam-stat.el (spam-stat-install-hooks): Removed.
 (spam-stat-install-hooks): Don't run automatically.
gnus-msg.el (gnus-summary-reply-to-list-with-original): New command and keystroke.

lisp/bs.el (bs-cycle-next): Pass current buffer to `bury-buffer'.

Fixes: debbugs:8911

Auto-commit of generated files.

* lisp/emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
(Bug#8934)