* replace.el (multi-occur): Mention
`multi-occur-in-matching-buffers' in the doc string.

Fixes: debbugs:7566

* picture-xtra.texi (Rectangles in Picture): Clarify the prefix
argument for `C-c C-k' (bug#7391).

* customize.texi (Type Keywords): Clarify that :value provides a
default value for all types.

Fixes: debbugs:7386

(dired-mark-if): Make the message about whether it's marking or unmarking clearer (bug#8523)

Merge changes made in Gnus trunk.

nnir.el (nnir-run-imap): Allow halting a search when an article is found by setting `shortcut' in 'query.
 (nnir-request-article): Use `shortcut' setting when requesting article by Message-ID.
gnus-msg.el (gnus-bug): Give the Version and Package headers to debbugs with the X-Debbugs-Package and X-Debbugs-Version headers.  Bring the pseudo-headers back too.

* frames.texi (Fonts): Mention "C-u C-x =" to find out what font
you're currently using.

Fixes: debbugs:8489

* streams.texi (Output Functions): Document `pp'.

* disp-table.el (display-table-print-array): New function.
(describe-display-table): Use it to print the vectors more pretty
(Bug#8859).

Remove clone-number support.  Provide clone-of parameter in window states.

* window.h (window): Remove clone_number slot.
* window.c (Fwindow_clone_number, Fset_window_clone_number):
Remove.
(make_parent_window, make_window, saved_window)
(Fset_window_configuration, save_window_save): Don't deal with
clone numbers.
* buffer.c (Qclone_number): Remove declaration.
(sort_overlays, overlay_strings): Don't deal with clone numbers.

* window.el (window-state-get-1): Don't assign clone numbers.
Add clone-of item to list of window parameters.
(window-state-put-2): Don't process clone numbers.
(display-buffer-alist): Fix doc-string.

Auto-commit of loaddefs files.

Auto-commit of generated files.

Add multiple inheritance to keymaps.
* src/keymap.c (Fmake_composed_keymap): New function.
(Fset_keymap_parent): Simplify.
(fix_submap_inheritance): Remove.
(access_keymap_1): New function extracted from access_keymap to handle
embedded parents and handle lists of maps.
(access_keymap): Use it.
(Fkeymap_prompt, map_keymap_internal, map_keymap, store_in_keymap)
(Fcopy_keymap): Handle embedded parents.
(Fcommand_remapping, define_as_prefix): Simplify.
(Fkey_binding): Simplify.
(syms_of_keymap): Move minibuffer-local-completion-map,
minibuffer-local-filename-completion-map,
minibuffer-local-must-match-map, and
minibuffer-local-filename-must-match-map to Elisp.
(syms_of_keymap): Defsubr make-composed-keymap.
* src/keyboard.c (menu_bar_items): Use map_keymap_canonical.
(parse_menu_item): Trivial simplification.
* lisp/subr.el (remq): Don't allocate if it's not needed.
(keymap--menu-item-binding, keymap--menu-item-with-binding)
(keymap--merge-bindings): New functions.
(keymap-canonicalize): Use them to refine the canonicalization.
* lisp/minibuffer.el (minibuffer-local-completion-map)
(minibuffer-local-must-match-map): Move initialization from C.
(minibuffer-local-filename-completion-map): Move initialization from C;
don't inherit from anything here.
(minibuffer-local-filename-must-match-map): Make obsolete.
(completing-read-default): Use make-composed-keymap to combine
minibuffer-local-filename-completion-map with either
minibuffer-local-must-match-map or
minibuffer-local-filename-completion-map.

* lisp/type-break.el (type-break-time-sum): Use dolist.
This avoids using a free variable.

Replace runtime CL function, as flagged by the compiler.

* lisp/textmodes/flyspell.el (flyspell-word-search-backward):
Replace CL function.

Fix last change with indexing coding-systems.

 doc/emacs/mule.texi (Coding Systems): Move index entries from the previous
 change into their proper places.

* lisp/mouse.el (mouse--strip-first-event): New function.
(function-key-map): Use it to map fringe clicks to normal clicks by default.

Fix typos that break xsettings.c compilation.

* configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.

* src/Makefile.in (SETTINGS_LIBS): Fix typo.

* lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update.
(vc-bzr-revision-completion-table): Add support for annotate and date.

* lisp/emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
inherit from parent.

* help.texi (Help Files): Document view-external-packages (bug#8902).

* mule.texi (Coding Systems): Put a few more of the coding systems into the index.

Fixes: debbugs:8900

auth-source.el (auth-source-token-passphrase-callback-function): Simplify and remove EPA dependency.

(dired-show-file-type): Doc fixup (bug#8818).

nnir.el (nnir-request-article): Fix error message text.

* dired-aux.el (dired-diff): Doc fixup (bug#8816).

* dired.el (dired-mode): Fix up the doc string as suggested by
Drew Adams (bug#8817).

* coding.c (Fencode_coding_string): Record the last coding system
used, as the function doc string says.

Fixes: debbugs:8738

* progmodes/flymake.el (flymake-find-file-hook): Add an `autoload'
cookie, since the manual says that it should be possible to add
this function to `find-file-hook'.

Auto-commit of loaddefs files.

Auto-commit of generated files.

* progmodes/cfengine.el: Minor update to docs.

Moved `cfengine3-mode' to cfengine.el.  Removed cfengine3.el.

* progmodes/cfengine.el: Moved all cfengine3.el functionality
here.  Noted Ted Zlatanov as the maintainer.
(cfengine-common-settings, cfengine-common-syntax): New functions
to set up common things between `cfengine-mode' and
`cfengine3-mode'.
(cfengine3-mode): New mode.
(cfengine3-defuns cfengine3-defuns-regex
(cfengine3-class-selector-regex cfengine3-category-regex)
(cfengine3-vartypes cfengine3-font-lock-keywords)
(cfengine3-beginning-of-defun, cfengine3-end-of-defun)
(cfengine3-indent-line): Added from cfengine3.el.

CC Mode: New "guessing" of style.

cc-mode.texi (Guessing the Style): New page.
(Styles): Add a short introduction to above.

* process.c: Add defined (HAVE_GSETTINGS) for xgselect.h
(wait_reading_process_output): Add defined (HAVE_GSETTINGS) for
xg_select.

* xgselect.c: Add defined (HAVE_GSETTINGS).
(xgselect_initialize): Ditto.

* xsettings.c (store_monospaced_changed): Take new font as arg and
check for change against current_mono_font.
(EMACS_TYPE_SETTINGS): Remove this and related defines.
(emacs_settings_constructor, emacs_settings_get_property)
(emacs_settings_set_property, emacs_settings_class_init)
(emacs_settings_init, gsettings_obj): Remove.
(something_changedCB): New function for HAVE_GSETTINGS.
(something_changedCB): HAVE_GCONF: Call store_monospaced_changed
with value as argument.
(init_gsettings): Check that GSETTINGS_SCHEMA exists before calling
g_settings_new.  Do not create gsettings_obj.
Remove calls to g_settings_bind. Connect something_changedCB to
"changed".

Fixes: debbugs:8967

* net/tramp.el (tramp-encoding-command-interactive): New defcustom.

* net/tramp-sh.el (tramp-maybe-open-connection): Use it.

Add plstore-delete.

* auth-source.el (plstore-delete): Autoload.
(auth-source-plstore-search): Support delete operation.
* plstore.el (plstore-delete): New function.

gnus-draft.el (gnus-draft-clear-marks): Revert last change; mark actually existing articles as unread rather than the ones that active asserts.

Fix license and copyright years.

Comment-out buffer display obsolescences and fix call in display-buffer.

* window.el (same-window-buffer-names, same-window-regexps)
(same-window-p, special-display-frame-alist)
(special-display-popup-frame, special-display-function)
(special-display-buffer-names, special-display-regexps)
(special-display-p, pop-up-frame-alist, pop-up-frame-function)
(pop-up-frames, display-buffer-reuse-frames, pop-up-windows)
(split-window-preferred-function, split-height-threshold)
(split-width-threshold, even-window-heights)
(display-buffer-mark-dedicated, window-splittable-p)
(split-window-sensibly, window-safely-shrinkable-p):
Un-obsolete.
(display-buffer): Don't spread args with function specifier
because special-display-popup-frame won't like it.

Merge from trunk.

* eval.c (struct backtrace): Simplify and port the data structure.

Do not assume that "int nargs : BITS_PER_INT - 2;" produces a
signed bit field, as this assumption is not portable and it makes
Emacs crash when compiled with Sun C 5.8 on sparc.  Do not use
"char debug_on_exit : 1" as this is not portable either; instead,
use the portable "unsigned int debug_on_exit : 1".  Remove unused
member evalargs.  Remove obsolete comments about cc bombing out.

* woman.el (woman-decode-buffer, WoMan-log-end): Log fractional secs

by using time-since and float-time.

* vc/ediff-util.el (ediff-calc-command-time): Use time-since

and float-time.  Say "NNN.NNN seconds" rather than "NNN seconds
+ NNN microseconds".

* type-break.el (type-break-time-sum): Rewrite using time-add.

gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read.

* lisp/window.el (bury-buffer): Don't iconify the only frame.
(switch-to-buffer): Revert to Emacs<23 behavior, i.e. do not fallback
to pop-to-buffer.  Use pop-to-buffer-same-frame if you don't like that.

* eshell/em-smart.el (eshell-smart-display-navigate-list): Add mouse-yank-primary.

* progmodes/cfengine3.el: New file to support CFEngine 3.x.

* lisp/emacs-lisp/find-func.el (find-library--load-name): New fun.
(find-library-name): Use it to find relative load names when provided
absolute file name.

Fixes: debbugs:8803

Fix commit 2011-07-01T01:34:38Z!ueno@unixuser.org.

* play/hanoi.el (hanoi-current-time-float): Remove.

All uses replaced by float-time.

* nxml/rng-maint.el (rng-time-function): Rewrite using time-subtract.

This yields a more-accurate answer.
(rng-time-to-float): Remove; no longer needed.

* nntp.el (nntp-record-command): Use format-time-string.

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

Add public key encryption support to plstore.

* plstore.el (plstore-select-keys, plstore-encrypt-to): New variable.
(plstore-save): Support public key encryption.
(plstore--init-from-buffer): New function.
(plstore-open): Use it; fix error when opening a non-existent file.
(plstore-revert): Use plstore--init-from-buffer.

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

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

* auth-source.el (auth-source-backend): Fix :initarg for data slot.

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