Grep alias `all' shall not match parent directory

* lisp/progmodes/grep.el (grep-files-aliases): Don't match parent
  directory for `all'. Fixes bug#22577

; Auto-commit of ChangeLog files.

; Auto-commit of loaddefs files.

Bump version to 25.0.91

* README:
* configure.ac:
* msdos/sed2v2.inp: Bump version to 25.0.91.

* etc/AUTHORS: Update the AUTHORS file

; fix changelog entries

; make change-history-commit

* lisp/dired-aux.el: Require cl-lib.  (Bug#22613)

; Improve commentary in insdel.c

* src/insdel.c (gap_left, gap_right, make_gap_larger)
(make_gap_smaller): Improve commentary.

Index tilde characters in names of backup files

* doc/emacs/files.texi (Backup Names): Improve indexing.
(Bug#22625)

Document deprecation of hi-lock-mode's 'C-x w' bindings

* doc/emacs/display.texi (Highlight Interactively): Deprecate the
"C-x w" bindings of hi-lock-mode.

* etc/NEWS: Mark the deprecation entry as documented.

; * etc/NEWS: Use double spaces to end a sentence.

Announce that the `C-x w' bindings are deprecated

Suppress GNUstep hardening

Fedora 23 normally hardens GNUstep applications, which causes
‘./configure --with-ns’ to break Emacs’s funky way of undumping.
Fix this by eliding the hardening options (Bug#22518).
* src/Makefile.in (LIBS_GNUSTEP): Omit options like
‘-specs=/usr/lib/rpm/redhat/redhat-hardened-ld’.
(GNU_OBJC_CFLAGS): Omit options like
‘-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1’.

Fix redisplay after a large insertion

* src/xdisp.c (redisplay_internal): Don't accept the results of
"optimization 3" if the cursor ends up in a partially visible
glyph row.  (Bug22637)

Revert "Fix gnus-group-get-new-news-this-group on group with closed server"

This reverts commit 9dc77e37aa84c6df9b3ddb4609f3c09201b0580e.

* lisp/gnus/nnimap.el (nnimap-change-group): Revert last
change.  (Bug#22634)

; Improve merge documentation in CONTRIBUTE

* CONTRIBUTE (branches): Tell how to avoid merging of
non-backported changes.

* lib-src/make-docfile.c: Include stdarg.h.

Extend gpm-mouse-mode's doc string and doc to point out limitations.

* lisp/t-mouse.el (gpm-mouse-mode): Extend doc string to indicate the
inability to transfer text between Emacs and other programs which use GPM.

* doc/emacs/frames.texi (Text-Only Mouse): Note the inability to transfer text
between Emacs and other progrmas which use GPM.

Revert "Backport: * lisp/isearch.el: Turn char-folding off by default"

* lisp/isearch.el: Turn char-folding back oon by default.

This reverts commit 12c50e82c9b432b2fc31f8fb2215f43ceea80822.

Revert "Support integer image rotation and respect EXIF rotations"

This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8.

This change does not work on Fedora.

Revert "Document EXIF image rotation"

This reverts commit 10b8ed27ec91ff52f93eb0297dcc3abb214931aa.

This change does not work on Fedora, for instance.

Document OS X LANG default

* doc/emacs/cmdargs.texi (General Variables):
Document OS X Language and Region system preference.
Suggested by Alan Third.

Set locale when run from OS X GUI

* src/emacs.c (main): Call ns_init_locale.
* src/nsterm.m (ns_init_locale): Get locale from OS and set LANG.
* src/nsterm.h: Include ns_init_locale.

make-docfile cleanup for I/O, etc.

* lib-src/make-docfile.c (progname, generate_globals, num_globals)
(num_globals_allocated, globals): Now static.
(generate_globals, struct rcsoc_state, read_c_string_or_comment):
(write_c_args, scan_c_stream, search_lisp_doc_at_eol, scan_lisp_file):
Use bool for boolean.
(verror): New function.
(fatal, error): Use it.  API is now like printf.  All callers changed.
(main): Remove err_count local that was always 0.
(main, scan_c_stream, scan_lisp_file): Check for I/O error.
(scan_file, scan_c_file, scan_c_stream, scan_lisp_file):
Return void, not 0.
(put_char, scan_keyword_or_put_char, scan_c_file): Use char for byte.
(scan_keyword_or_put_char): Check for missing ( and unexpected EOF.
(close_emacs_globals): Use ptrdiff_t for index, not int.
(scan_c_file, scan_lisp_file): Exit with failure if file cannot be
opened, rather than diagnosing but exiting with status 0.
(search_lisp_doc_at_eol): Don't worry about ungetc of EOF; it's
portable now.

Memory-management cleanup in make-docfile

I compiled it with -fsanitize=address and fixed the leaks it detected.
Also, I changed it to prefer signed to unsigned integer types,
and to check for integer overflow.
* lib-src/make-docfile.c:
Include <stddef.h>, <stdint.h>, <intprops.h>, <min-max.h>.
(memory_exhausted): New function.
(xmalloc, xrealloc): Use it.
(xmalloc, xrealloc, scan_file, struct rcsoc_state, write_c_args)
(uncompiled, scan_lisp_file):
Prefer signed integer types to unsigned.
(xstrdup): Remove.  All uses removed.
(num_globals, num_globals_allocated, write_globals, scan_c_stream):
Use ptrdiff_t, not int, for indexes that in theory could exceed INT_MAX.
(add_global): Use const to pacify --enable-gcc-warnings.
Make a copy here, rather than relying on strdup calls later.
(add_global, write_globals, scan_c_stream):
Avoid integer overflow when calculating sizes.
(write_globals, scan_c_stream, scan_lisp_file): Avoid memory leak.
(scan_c_stream): Check for add_global failure.

Kevin Gallagher has new email address

* lisp/emulation/edt.el:
* lisp/emulation/edt-lk201.el:
* lisp/emulation/edt-mapper.el:
* lisp/emulation/edt-pc.el:
* lisp/emulation/edt-vt100.el:
* etc/edt-user.el:
* doc/misc/edt.texi: Update Kevin Gallagher's email address.

Improve doc strings of 'forward/backward-word-strictly'

* lisp/simple.el (backward-word): Refer to 'backward-word-strictly'
in the doc string.  Suggested by Glenn Morris <rgm@gnu.org>.
* lisp/subr.el (forward-word-strictly, backward-word-strictly):
Mention 'subword-mode' in the doc strings.

* src/syntax.c (Fforward_word): Refer to 'forward-word-strictly'
in the doc string.  (Bug#22560)

Describe Makefile test targets in test/README

* CONTRIBUTE: Move Makefile test targets to test/README.

* Makefile.in:
* test/README: Describe Makefile test targets.

Backport: * lisp/isearch.el: Turn char-folding off by default

(search-default-mode): Set default value to nil.

Document EXIF image rotation

* doc/lispref/display.texi (ImageMagick Images): Mention EXIF rotation.

Support integer image rotation and respect EXIF rotations

* src/image.c (imagemagick_load_image): Allow integer rotations in
addition to floating point rotations (bug#22591).
* src/image.c (imagemagick_load_image): Images that have an
orientation given in EXIF and have no explicit :rotation tag are now
pre-rotated.  All information such as width/height is reported for the
rotated image.

Quote table names for postgres listings (sql-mode)

* lisp/progmodes/sql.el (sql-postgres-completion-object): Avoid passing
  unquoted table names to the completion list.

* lisp/replace.el (replace-match-maybe-edit): Make arg `backward' optional.

Doc fix.
(replace-search, replace-highlight): Make arg `backward' optional.
(Bug#18388)

* lisp/simple.el (next-line-or-history-element): Reset temporary-goal-column.

(previous-line-or-history-element): Reset temporary-goal-column.
Use end-of-visual-line instead of line-end-position.  (Bug#22544)

Suppress ACL ops if configured with --disable-acl

Without this patch, some ACL operations were suppressed, but not all.
* src/fileio.c [!USE_ACL]: Do not include sys/acl.h.
(Ffile_acl, Fset_file_acl) [!USE_ACL]: Return nil in this case.

Mention web bugs

* doc/misc/emacs-mime.texi (Display Customization):
Mention web bugs in the mm-html-blocked-images section.

Make mm-html-blocked-images default to "" again

* lisp/gnus/mm-decode.el (mm-html-blocked-images):
Default to "" that blocks all external images.

* doc/misc/emacs-mime.texi (Display Customization):
Mention that mm-html-blocked-images defaults to "".

Minor alignas cleanup

* src/lisp.h (alignas): Remove now-redundant #ifdef that was left
over from the old way of doing things, before Bug#20862 was fixed.

Add lmalloc commentary and tweak laligned

* src/alloc.c (laligned): Help compiler in a tiny way by putting
the more-commonly-failing disjunct first.

Clarify documentation of key binding conventions

* doc/lispref/tips.texi (Key Binding Conventions): Clarify which
"punctuation characters" are reserved after "C-c".  (Bug#22604)

* etc/NEWS: mention the `vc-faces' customization group

Sync with gnulib

This incorporates:
2016-02-09 stdalign: port to clang 3.7.0
2016-02-06 misc: port better to gcc -fsanitize=address
* doc/misc/texinfo.tex, lib/stdalign.in.h, m4/acl.m4, m4/getgroups.m4:
Copy from gnulib.

* CONTRIBUTE: Add more examples for $(SELECTOR) make variable.

Make mm-html-inhibit-images and mm-html-blocked-images default to nil

* lisp/gnus/mm-decode.el (mm-html-inhibit-images)
(mm-html-blocked-images): Default to nil.

* doc/misc/emacs-mime.texi (Display Customization): Mention that
mm-html-inhibit-images and mm-html-blocked-images default to nil.

* etc/NEWS (Gnus): Document mm-html-inhibit-images and
mm-html-blocked-images.

Increase success rate of fallback lmalloc

* src/alloc.c (lmalloc, lrealloc): Reallocate with (typically)
larger and larger sizes, to increase the probability that
the allocator will return a Lisp-aligned pointer.

Make backgrounds extend to the end of the lines in shr

* lisp/net/shr.el (shr-face-background): Faces can also be on
the form `(:background "#fff)' (bug#22547).

Make the `R' command get the correct relative <img>s

* lisp/net/eww.el (eww-readable): Preserve the base URL so
that image expansions are fetched from the right place (bug#22605).

(cherry picked from commit 8722e849f75ceafb82a1c17105e8ab76077a8ebc)

Backport:

Fix typos in emacs-mime.texi and gnus.texi

* doc/misc/emacs-mime.texi (Display Customization):
* doc/misc/gnus.texi (HTML): Fix typo.

* doc/misc/emacs-mime.texi (Display Customization):
Doc fix for mm-html-inhibit-images.

Fix message-cross-post-followup-to group names

* lisp/gnus/message.el (message-cross-post-followup-to): Don't
insert group names like "nntp+foo:zot", because those aren't valid.

Compare recipient and keys case-insensitively

* lisp/gnus/mml2015.el: (mml-secure-check-user-id): When comparing a
recipient address with that from a key, do so in a case insensitive
manner (bug#22603).

* lisp/gnus/mm-decode.el (mm-alist-to-plist): Doc fix.

Refactor HTML images handling of Gnus and mm-* (a part of bug#21650)

* doc/misc/emacs-mime.texi (Display Customization):
Remove mm-inline-text-html-with-images; add documentations for
mm-html-inhibit-images and mm-html-blocked-images.

* lisp/gnus/gnus-art.el (gnus-article-show-images):
No need to bind mm-inline-text-html-with-images.
(gnus-bind-safe-url-regexp): Rename to gnus-bind-mm-vars.
(gnus-bind-mm-vars): Rename from gnus-bind-safe-url-regexp;
bind mm-html-inhibit-images and mm-html-blocked-images.
(gnus-mime-view-all-parts, gnus-mime-view-part-internally)
(gnus-mm-display-part, gnus-mime-display-single)
(gnus-mime-display-alternative): Use gnus-bind-mm-vars.

* lisp/gnus/mm-decode.el (mm-inline-text-html-with-images): Remove.
(mm-html-inhibit-images, mm-html-blocked-images): New user options.
(mm-shr): Bind shr-inhibit-images and shr-blocked-images with
mm-html-inhibit-images and mm-html-blocked-images respectively
instead of gnus-inhibit-images and gnus-blocked-images.

* lisp/gnus/mm-view.el (mm-setup-w3m): Use mm-html-inhibit-images
instead of mm-inline-text-html-with-images.

Port to FreeBSD 11-CURRENT i386

Problem reported by Herbert J. Skuhra in:
http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00354.html
Instead of trying
* src/alloc.c (lmalloc, lrealloc, laligned): New functions.
(xmalloc, xzalloc, xrealloc, lisp_malloc): Use them.
(__alignof__) [!__GNUC__ && !__alignof__]: New macro.
(MALLOC_IS_GC_ALIGNED): New macro.
* src/lisp.h (NONPOINTER_BITS): Remove.  All uses removed.
No longer needed now that alloc.c uses lmalloc and lrealloc.

Some fixes in file-notify-tests.el

* test/automated/file-notify-tests.el
(file-notify--test-with-events-check)
(file-notify--test-with-events-explainer): New defuns.
(file-notify--test-with-events): Use it.
(file-notify-test07-backup): Fix docstring.  Some of the
backends fire two `changed' events.  Backup by rename doesn't
work for kqueue.

; * etc/NEWS: Clarify entry about bracketed paste mode.

Fix Bug#22557

* lisp/filenotify.el (file-notify-callback): Do not send a
`stopped' event in case of backup by renaming.  (Bug#22557)

* test/automated/Makefile.in: Use $(SELECTOR_EXPENSIVE) for
all targets but check and check-maybe.

* test/automated/file-notify-tests.el
(file-notify--test-read-event-timeout): New defconst.
(file-notify--deftest-remote, file-notify--wait-for-events)
(file-notify-test02-events)
(file-notify-test04-file-validity)
(file-notify-test06-many-events): Use it.
(file-notify--test-cleanup): Make it more robust.  Delete also
backup file.
(file-notify-test07-backup): New test.

Fix test for dladdr

Problem reported by Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00327.html
* configure.ac (dladdr): Link with LIBMODULES when checking for
this function.

Fix gnus-group-get-new-news-this-group on group with closed server

* lisp/gnus/nnimap.el (nnimap-change-group): Lookup server
method and pass to nnimap-open-server.

; Auto-commit of ChangeLog files.

* lisp/comint.el (comint-prompt-read-only): Clean tabs in docstring

While tabs in code are mostly fine because the Emacs sources have a
.dir-locals file specifying tab-width, the same is not true of tabs in
code examples inside docstrings.  The docstring is printed on a *Help*
buffer, which can be created on any directory and won't necessarily have
the same tab-width set.

Don't inloop gnus-uu-mark-thread on the last thread

* lisp/gnus/gnus-uu.el (gnus-uu-mark-thread): Don't infloop on the
final thread in the summary buffer (bug#16666).

Display non-ASCII group names better in prompts

* lisp/gnus/gnus-sum.el (gnus-articles-to-read): To decode the
group name, we have to do that before we remove the prefix.

Default to gpg2 instead of gpg

* lisp/epg-config.el (epg-gpg-program): Prefer gpg2 over gpg, if
it exists.  This fixes many problems with using the GPG
authentication agent.

src/process.c Correctly convert AF_INET6 addresses

* src/process.c (conv_lisp_to_sockaddr): AF_INET6 addresses are
converted to a list of 16 bit quantities by
conv_sockaddr_to_lisp(). conv_lisp_to_sockaddr() should follow the
same scheme rather than expecting a (longer) list of 8 bit
quantities.

Backport:

(cherry picked from commit 55ce3c30d617c38eb086d5ad4ffbd881c20c559c)

* lisp/isearch.el (isearch-define-mode-toggle): Improve logic

* lisp/menu-bar.el (menu-bar-options-menu): New search submenu

(menu-bar-search-options-menu): New variable

* lisp/isearch.el (search-default-mode)

(isearch-regexp-function): Improve docstrings.

* lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode

(search-default-mode): New variable.
(isearch-mode, isearch-define-mode-toggle)
(isearch--describe-regexp-mode): Update accordingly.
* lisp/menu-bar.el (nonincremental-search-forward): Update accordingly.
* etc/NEWS: Update accordingly.
* doc/emacs/search.texi: Update accordingly.

Use monitor's resolution for positioning tooltips

* src/xfns.c (compute_tip_xy): Use the resolution of the monitor where
  the mouse pointer is to avoid placing the tooltip over the border of
  the monitor on multi-head displays. Fixes bug#22549.

Fix file-notify-test on MS-Windows

* test/automated/file-notify-tests.el (file-notify--test-timeout):
Reduce w32notify timeout to 10 sec.
(file-notify-test06-many-events): Call read-event after each
rename, to keep the w32notify backend happy in batch mode.
(Bug#22534)

Fix issues found by auditing w32notify code

* src/w32inevt.c (handle_file_notifications): Count the number of
events to be returned.
* src/w32notify.c (send_notifications): Don't copy to the file
notification buffer more than it can hold.  (Bug#22534)

Extend etags Ruby support for accessors

* lib-src/etags.c (Ruby_functions): Support accessors defined with
parentheses.  (Bug#22563)

* test/etags/ruby-src/test1.ru (A::B): Add tests for accessors
defined with parentheses.
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to changes in Ruby tests.

Update publicsuffix.txt.

* etc/publicsuffix.txt: Updated from
https://publicsuffix.org/list/public_suffix_list.dat.

Ensure that Gnus dribble handling allows removing entries

* lisp/gnus/gnus-start.el (gnus-dribble-enter): Ensure that each
entry is on a single line.

Be consistent when using encoded strings in nnimap data

* lisp/gnus/nnimap.el (nnimap-encode-gnus-group): New function
(nnimap-request-list): Use it.
(nnimap-request-newgroups): Ditto.

Copyright-paperwork-exempt: yes

Display the decoded Gnus group name

* lisp/gnus/gnus-sum.el (gnus-summary-read-group-1): Use the
decoded group name in the message.

Copyright-paperwork-exempt: yes

Use completion-ignore-case instead of defining command

* lisp/erc/erc.el (erc-mode): Set completion-ignore-case so
that we get case-insensitive completion.
(erc-completion-at-point): Remove.

Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

* test/automated/file-notify-tests.el (file-notify-test06-many-events):

Reduce the number of iterations to 250 in case of w32notify.

Fix problems caused by new implementation of sub-word mode

* lisp/subr.el (forward-word-strictly, backward-word-strictly):
New functions.
(word-move-empty-char-table): New variable.

* etc/NEWS: Mention 'forward-word-strictly' and
'backward-word-strictly'.

* doc/lispref/positions.texi (Word Motion): Document
'find-word-boundary-function-table', 'forward-word-strictly', and
'backward-word-strictly'.  (Bug#22560)

* src/syntax.c (syms_of_syntax)
<find-word-boundary-function-table>: Doc fix.

* lisp/wdired.el (wdired-xcase-word):
* lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name)
(texinfo-copy-section-title, texinfo-start-menu-description)
(texinfo-copy-menu-title, texinfo-specific-section-type)
(texinfo-insert-node-lines, texinfo-copy-next-section-title):
* lisp/textmodes/texinfo.el (texinfo-clone-environment)
(texinfo-insert-@end):
* lisp/textmodes/texinfmt.el (texinfo-format-scan)
(texinfo-anchor, texinfo-multitable-widths)
(texinfo-multitable-item):
* lisp/textmodes/tex-mode.el (latex-env-before-change):
* lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify):
* lisp/skeleton.el (skeleton-insert):
* lisp/simple.el (count-words):
* lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit)
(vhdl-beginning-of-defun, vhdl-beginning-of-statement-1)
(vhdl-update-sensitivity-list, vhdl-template-block)
(vhdl-template-break, vhdl-template-case, vhdl-template-default)
(vhdl-template-default-indent, vhdl-template-for-loop)
(vhdl-template-if-then-use, vhdl-template-bare-loop)
(vhdl-template-nature, vhdl-template-procedural)
(vhdl-template-process, vhdl-template-selected-signal-asst)
(vhdl-template-type, vhdl-template-variable)
(vhdl-template-while-loop, vhdl-beginning-of-block)
(vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func):
* lisp/progmodes/verilog-mode.el (verilog-backward-sexp)
(verilog-forward-sexp, verilog-beg-of-statement)
(verilog-set-auto-endcomments, verilog-backward-token)
(verilog-do-indent):
* lisp/progmodes/vera-mode.el (vera-guess-basic-syntax)
(vera-indent-block-closing):
* lisp/progmodes/simula.el (simula-context)
(simula-backward-up-level, simula-forward-down-level)
(simula-previous-statement, simula-next-statement)
(simula-skip-comment-backward, simula-calculate-indent)
(simula-find-if, simula-electric-keyword):
* lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p):
* lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p)
(ruby-smie--forward-token, ruby-smie--backward-token)
(ruby-singleton-class-p, ruby-calculate-indent)
(ruby-forward-sexp, ruby-backward-sexp):
* lisp/progmodes/ps-mode.el (ps-run-goto-error):
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function)
(perl-syntax-propertize-special-constructs)
(perl-backward-to-start-of-continued-exp):
* lisp/progmodes/pascal.el (pascal-indent-declaration):
* lisp/progmodes/octave.el (octave-function-file-p):
* lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax):
* lisp/progmodes/js.el (js--forward-function-decl):
* lisp/progmodes/idlwave.el (idlwave-show-begin-check)
(idlwave-beginning-of-block, idlwave-end-of-block)
(idlwave-block-jump-out, idlwave-determine-class):
* lisp/progmodes/icon.el (icon-is-continuation-line)
(icon-backward-to-start-of-continued-exp, end-of-icon-defun):
* lisp/progmodes/hideif.el (hide-ifdef-define):
* lisp/progmodes/f90.el (f90-change-keywords):
* lisp/progmodes/cperl-mode.el (cperl-electric-pod)
(cperl-linefeed, cperl-electric-terminator)
(cperl-find-pods-heres, cperl-fix-line-spacing)
(cperl-invert-if-unless):
* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur):
* lisp/progmodes/cc-align.el (c-lineup-java-inher):
* lisp/progmodes/ada-mode.el (ada-compile-goto-error)
(ada-adjust-case-skeleton, ada-create-case-exception)
(ada-create-case-exception-substring)
(ada-case-read-exceptions-from-file, ada-after-keyword-p)
(ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end)
(ada-get-indent-if, ada-get-indent-block-start)
(ada-get-indent-loop, ada-get-indent-type)
(ada-search-prev-end-stmt, ada-check-defun-name)
(ada-goto-decl-start, ada-goto-matching-start)
(ada-goto-matching-end, ada-looking-at-semi-or)
(ada-looking-at-semi-private, ada-in-paramlist-p)
(ada-search-ignore-complex-boolean, ada-move-to-start)
(ada-move-to-end, ada-which-function, ada-gen-treat-proc):
* lisp/net/quickurl.el (quickurl-grab-url):
* lisp/mail/sendmail.el (mail-do-fcc):
* lisp/mail/rmail.el (rmail-resend):
* lisp/mail/mailabbrev.el (mail-abbrev-complete-alias):
* lisp/mail/mail-extr.el (mail-extract-address-components):
* lisp/json.el (json-read-keyword):
* lisp/files.el (insert-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/completion.el (symbol-under-point, symbol-before-point)
(symbol-before-point-for-complete, next-cdabbrev)
(add-completions-from-c-buffer):
* lisp/cedet/semantic/texi.el (semantic-up-context)
(semantic-beginning-of-context):
* lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables):
use 'forward-word-strictly' and 'backward-word-strictly' instead
of 'forward-word' and 'backward-word'.

; * etc/NEWS: Expand news entry for scss-mode

; Better document changes in ls-lisp default behavior

* etc/NEWS: Explain in more detail the effects of the new
default sorting in ls-lisp on Dired display.  (Bug#22561)

Fix doc string of tls-program

* lisp/net/tls.el (tls-program): Document the %t parameter (bug#22559).

Restore window conf in nsm

* lisp/net/nsm.el (nsm-query-user): Restore the window configuration.

Backport:

* etc/NEWS: Document new mpc.el features

* lisp/custom.el (defface): Revert indentation change.  (Bug#22524)

Correctly fontify C++ initializations which "look like" functions.

Fixes bug#7579.

lisp/progmodes/cc-engine.el (c-forward-declarator): Add extra optional
parameter to enable handling of "anonymous" declarators in declarations.

lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Check more rigorously
whether a "(" opens a parameter list of a function, or an initialization of a
variable.

Improve newsticker-treeview-selection-face

* newst-treeview.el (newsticker-treeview-selection-face): Improve
readability for dark background.

Minor fix in tagging Ruby accessors by etags

* lib-src/etags.c (Ruby_functions): Don't tag accessors whose
names are not literal symbols.  (Bug#22241)

Spelling fixes

Remove 'def X' from the example

* test/etags/ruby-src/test1.ru (A::B): Remove 'def X'
(http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html).
* test/etags/CTAGS.good:
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6: Adjust accordingly.

Allow sending empty hidden values in eww

* lisp/net/eww.el (eww-tag-input): Allow sending empty hidden
values (bug#22388).

Copyright-paperwork-exempt: Yes
(cherry picked from commit 5898da8210af7953e638ddf7821c05260979c3f0)

Backport:

Make erc work better when encountering unknown prefix chars

* lisp/erc/erc.el (erc-channel-receive-names): Output a warning
instead of erroring out on unknown prefix chars (bug#22380).

Make erc completion case-insensitive again

* lisp/erc/erc.el (erc-completion-at-point): Make erc completion
case-insensitive again (bug#11360).

Make complection in erc use consistent casing

* lisp/erc/erc-pcomplete.el (pcomplete-erc-all-nicks): Make
case in the complection consistent (bug#18509).

Copyright-paperwork-exempt: Yes

Make /QUIT in erc more robust

* lisp/erc/erc.el (erc-kill-query-buffers): Don't bug out if we're
issuing /QUIT to disconnected servers (bug#22099).

Make tracking faces in Emacs work more reliably

* lisp/erc/erc-track.el (erc-faces-in): Always return lists of
faces to avoid later ambiguity (bug#22424).

Copyright-paperwork-exempt: Yes

Make shr not bug out on images on non-graphical displays

* lisp/net/shr.el (shr-put-image): Don't bug out on alt-less
images on non-graphical displays (bug#22327).