Fix regressions in xref-find-definitions and ...-other-window

* lisp/progmodes/xref.el:
(xref--display-buffer-in-other-window)
(xref--display-buffer-in-window): New functions.
(xref--show-pos-in-buf): Use them (bug#33870)

Add MESSAGE string to bookmark-errors (bug#23408)

* lisp/bookmark.el (bookmark-errors): Add MESSAGE parameter string.

Always try to display tree-widget with images (Bug#36147)

Checking the result of display-images-p doesn't make sense if the
display capabilities when loading the file are different from the
display used to actually look at the widget (which is easily possible
now that Emacs supports both tty and graphic frames in the same
instance).
* lisp/tree-widget.el (tree-widget-image-enable): Default to t,
always.  This still shows text on displays that can't show images.

Allow trailing whitespace in --eval argument (Bug#36219)

* lisp/startup.el (command-line-1): Don't complain about trailing
garbage if it's only space, tab, or newline characters.

* lisp/net/trampver.el (customize-package-emacs-version-alist):

Adapt Tramp version integrated in Emacs 26.3.

* src/xfaces.c (dump_realized_face): Fix incorrect format string.

* src/xfaces.c (dump_realized_face): Fix format specifier.

* src/nsterm.m (ns_row_rect): Remove unused variable ‘f.’

; Merge from origin/emacs-26

The following commit was skipped:

200f63c (origin/emacs-26) tramp-test42-auto-load: Add expected-result.

Merge from origin/emacs-26

7a8f22b * test/lisp/url/url-file-tests.el (url-file): Use file:///, n...
0c5f6c6 Fix doc of srecompile-compile-split-code (Bug#36200)

; Merge from origin/emacs-26

The following commits were skipped:

e587338 Make sure Gnus imap group names are decoded before searching
746d42f Remove failing test erroneously added in backport

Merge from origin/emacs-26

6242324 * lisp/net/sieve-manage.el (sieve-manage-parse-capability): D...

; Merge from origin/emacs-26

The following commits were skipped:

9473231 (tag: emacs-26.2.90) ; * lisp/ldefs-boot.el: Update.
fb1c966 Bump Emacs version to 26.2.90
2b705cd * etc/AUTHORS: Update.

Merge from origin/emacs-26

f53ce87 ; ChangeLog.3 update
eca2677 Fix description of 'display-buffer-in-previous-window' again ...
7be50cd Consistently use @minus{} for negative arguments

# Conflicts:
# ChangeLog.3

Update hash value in pdumper.c

* src/pdumper.c (dump_fwd_buffer_obj) [CHECK_STRUCTS]: Update
the hash in HASH_Lisp_Buffer_Objfwd.  (Bug#36225)

Improve error message when dmpstruct.h needs to be updated

* src/pdumper.c (dump_cons, dump_interval_tree, dump_string)
(dump_marker, dump_overlay, dump_finalizer)
(dump_bignum, dump_float, dump_fwd_int, dump_fwd_bool)
(dump_fwd_obj, dump_fwd_buffer_obj, dump_fwd_kboard_obj)
(dump_fwd, dump_blv, dump_symbol, dump_vectorlike_generic)
(dump_hash_table, dump_buffer, dump_bool_vector, dump_subr)
(dump_vectorlike, dump_object, dump_charset) [CHECK_STRUCTS]:
Make the error message more specific where to find the comment
to CHECK_STRUCTS.

Probably fix the `helper' argument in feedmail.el

* lisp/mail/feedmail.el (feedmail-queue-send-edit-prompt-inner):
Return the helper function (instead of the symbol `helper') so
that the caller can actually call it.

Fix compilation warning in esh-cmd.el

* lisp/eshell/esh-cmd.el (pcomplete--here): Declare function to
avoid byte compilation warning, which is what erc-notify.el also
does in a similar situation.

Fix build warning in srecode/srt-mode

* lisp/cedet/srecode/srt-mode.el (srecode-inserter-prin-example):
Declare and require before use.

Silence warnings about obsolete functions in obsolete/vip.el

* lisp/obsolete/vip.el (ex-tag): Silence warnings about obsolete
functions because this is an obsolete file.

Suppress compilation warnings in obsolete/otodo-mode.el

* lisp/obsolete/otodo-mode.el (lexical): Suppress warnings about
non-prefixed variables because this file is obsolete.

Silence warning in obsolete/complete.el

* lisp/obsolete/complete.el (PC-do-completion): Suppress warning
about obsolete variable in obsolete function.

Make obsolete function zip-lists work again

* lisp/obsolete/cl-compat.el (zip-lists): Use cl-mapcan instead of
mapcan; mapcan now takes only two parameters.

Suppress compilation warning in supercite.el

* lisp/mail/supercite.el (curline): Suppress warning about
non-prefixed variable used by forms in the `sc-mail-glom-frame'
variable.

Suppress warning in mailheader.el

* lisp/mail/mailheader.el (headers): Suppress warning about
non-prefixed variable part of the advertised interface.

Suppress warning about non-prefixed variable in mailalias.el

* lisp/mail/mailalias.el (patters): Suppress warning about
non-prefixed variable used by `mail-complete-alist'.

Fix byte compilation warning in bindat.el

* lisp/emacs-lisp/bindat.el (bindat--unpack-item): Avoid a byte
compilation warning by using unibyte-string instead of concat +
string-make-unibyte.

Avoid printing entering/leaving messages in second stage bootstrap

* src/Makefile.in (%.elc): Default to not printing the
entering/leaving lines when compiling .el files in the second
stage of bootstrapping Emacs.  V=1 will output them.

Also test unpacking

Refactor for reuse

New file to test bindat functions

Suppress warning about `entry' in calendar

* lisp/calendar/cal-china.el (entry):
* lisp/calendar/cal-hebrew.el (entry): Suppress warning about
dynamically bound `entry', which has to be bound for
diary-chinese-anniversary and diary-hebrew-birthday to work.
These function can be used in the sexp part of users' diary files.

Suppress warning about prefixless date variable in calendar

* lisp/calendar/lunar.el (date):
* lisp/calendar/cal-persia.el (date):
* lisp/calendar/cal-mayan.el (date):
* lisp/calendar/cal-julian.el (date):
* lisp/calendar/cal-iso.el (date):
* lisp/calendar/cal-islam.el (date):
* lisp/calendar/cal-hebrew.el (date):
* lisp/calendar/cal-french.el (date):
* lisp/calendar/cal-coptic.el (date):
* lisp/calendar/cal-china.el (date):
* lisp/calendar/cal-bahai.el (date): Suppress warning about this
prefix-less dynamic variable, because it's part of the documented
calling convention used in the sexp part of users' diary files.

Clean up verilog-mode.el documentation examples to match behavior.

* verilog-mode.el (verilog-auto, verilog-auto-arg)
(verilog-auto-ascii-enum, verilog-auto-inout)
(verilog-auto-inout-comp, verilog-auto-inout-in)
(verilog-auto-inout-modport, verilog-auto-inout-module)
(verilog-auto-inout-param, verilog-auto-input)
(verilog-auto-insert-lisp, verilog-auto-inst)
(verilog-auto-inst-param, verilog-auto-inst-param-value)
(verilog-auto-output, verilog-auto-output-every, verilog-auto-reg)
(verilog-auto-reg-input, verilog-auto-reset, verilog-auto-sense)
(verilog-auto-tieoff, verilog-auto-undef, verilog-auto-unused)
(verilog-auto-wire, verilog-inject-auto, verilog-read-sub-decls):
Clean up documentation examples to match behavior.

Make url-tramp more robust

* lisp/url/url-tramp.el (url-tramp-convert-url-to-tramp)
(url-tramp-convert-tramp-to-url): Check, that obj is non-nil.

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Remove another variable obsolete since Emacs 22

* lisp/progmodes/cc-langs.el: Remove obsolete variable
c-opt-op-identitier-prefix.
* etc/NEWS: Announce it.  (Bug#36173)

Let tramp-archive unmount clean

* lisp/net/tramp-archive.el (tramp-archive-cleanup-hash):
Don't check for a proper method.

Make Tramp compatible to recent progress-reporter-update

* lisp/net/tramp-compat.el (tramp-compat-progress-reporter-update):
New defalias.

* lisp/net/tramp.el (tramp-progress-reporter-update): Add optional SUFFIX.

Some changes in process output read of Tramp

* lisp/net/tramp.el (tramp-handle-file-notify-rm-watch):
Read pending output.

* test/lisp/net/tramp-tests.el (tramp-test31-interrupt-process):
Use a timeout when reading process output.

Tag remote autorevert tests as unstable

* test/lisp/autorevert-tests.el (auto-revert--timeout):
Derive value from `auto-revert-interval'.
(auto-revert--deftest-remote): Tag it as `:unstable'.
(auto-revert-test05-global-notify, auto-revert-test06-write-file):
Suppress final newline.  Use `auto-revert--timeout'.

Remove Lucid Emacs support from bookmark.el

* lisp/bookmark.el: Remove Lucid Emacs support.
(Bug#36179)

Improve documentation of hash-code functions

* src/fns.c (Fsxhash_eq, Fsxhash_eql, Fsxhash_equal):
* doc/lispref/hash.texi (Defining Hash): Warn against assuming
that sxhash returns consistent results.

tramp-test42-auto-load: Add expected-result.

* test/lisp/net/tramp-tests.el (tramp-test42-auto-load):
Expect a failed result if remote file access is not enabled,
as it happens while doing the test on Windows.

* configure.ac: Lower required cairo version to 1.8.0.

Remove non-Xdbe double-buffering code on cairo

* src/xterm.c (x_begin_cr_clip, x_update_end) [USE_CAIRO]: Don't do
handcrafted double-buffering with image surface.

Rework x_scroll_run on cairo

* src/xterm.c (x_scroll_run) [USE_CAIRO]: Use FRAME_CR_CONTEXT or surface type
for conditions to call XCopyArea rather than FRAME_X_DOUBLE_BUFFERED_P.
Set compositing operator to CAIRO_OPERATOR_SOURCE when copying image.

* test/lisp/url/url-file-tests.el (url-file): Use file:///, not file://.

Fix doc of srecompile-compile-split-code (Bug#36200)

* lisp/cedet/srecode/compile.el (srecode-compile-split-code):
Remove leftover text from docstring.

Revert "Silence okuri-nasi count-up messaging during compilation"

This takes long enough on some systems that the messages are useful.

This reverts commit 1d2e4d22c922f94d6f4b75a5ead18cbc679c5dfe.

Fix problem in remote file notification

* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter)
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-sh-inotifywait-process-filter): Do not kill the process.
Let `file-notify-rm-watch' do the job.

* test/lisp/filenotify-tests.el (file-notify-test03-events)
(file-notify-test05-file-validity)
(file-notify-test09-watched-file-in-watched-dir): Do not
special-case remote files.

Silence okuri-nasi count-up messaging during compilation

* lisp/international/ja-dic-cnv.el (skkdic-set-okuri-nasi): Remove
messaging while compilation to make compilation more regular.

Make sure Gnus imap group names are decoded before searching

do not merge (fix unnecessary in Emacs 27)

* lisp/gnus/nnir.el (nnir-run-imap): Ensure that non-ascii group names
  have been fully decoded before passing them to imap search.

Revert "srecode/srt-mode compilation fix"

This led to a recursive require.

This reverts commit 9fac0e70e3f5b7d0b12b77cac50078e01f68ee70.

Fix previous object-print/cl-print-object changes

* lisp/cedet/srecode/insert.el
(srecode-insert-variable-secondname-handler):
* lisp/cedet/semantic/decorate/include.el
(semantic-decoration-fileless-include-describe):
(semantic-decoration-all-include-summary):
* lisp/cedet/semantic/db-find.el (semanticdb-find-log-activity):
* lisp/cedet/semantic/bovine/c.el
(semantic-c-describe-environment):
* lisp/cedet/semantic/analyze/debug.el
(semantic-analyzer-debug-insert-include-summary): Fix previous
object-print/cl-print-object changes that were nonsensical.

Avoid using registerv-make in senator.el

* lisp/cedet/semantic/senator.el (senator-register): New class.
(register-val-jump-to, register-val-describe)
(register-val-insert): New methods.
(senator-copy-tag-to-register): Use this instead of the deprecated
registerv-make function.

analyze/debug compilation fix

* lisp/cedet/semantic/analyze/debug.el (pulse): Require to avoid
byte compilation warning.

semantic/lex-spp compilation fix

* lisp/cedet/semantic/lex-spp.el
(semantic-lex-spp-analyzer-push-tokens-for-symbol): Use new name
for `semantic-lex-spp-anlyzer-do-replace'.

Use cl-typep instead of obsolete predicate functions throughout cedet

* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary):
(srecode-dictionary-add-entries):
(srecode-compound-toString):
(srecode-dump):
* lisp/cedet/srecode/compile.el (srecode-dump-code-list):
* lisp/cedet/semantic/util.el (semantic-something-to-tag-table):
* lisp/cedet/semantic/db-typecache.el (semanticdb-typecache-length):
* lisp/cedet/semantic/db-ref.el (semanticdb-check-references):
* lisp/cedet/semantic/db-find.el
(semanticdb-find-incomplete-cache-entries-p):
(semanticdb-find-translate-path-includes-default):
(semanticdb-find-results-p):
(semanticdb-find-result-with-nil-p):
* lisp/cedet/semantic/analyze/complete.el
(semantic-analyze-possible-completions): Use cl-typep instead of
functions like `srecode-dictionary-compound-value-child-p' etc.

srecode/srt-mode compilation fix

* lisp/cedet/srecode/srt-mode.el (srecode/insert): Require to
avoid compilation warning about unknown slot.  Remove function
declarations that point to that file.

srecode/find compilation fix

* lisp/cedet/srecode/find.el (srecode/compile): Require to
avoid compilation warning about unknown slot.  Remove function
declarations that point to that file.

srecode/dictionary compilation warning fix

* lisp/cedet/srecode/dictionary.el (srecode/fields): Require to
avoid compilation warning about unknown slot.  Remove function
declarations that point to that file.

srecode/dictionary compilation fix

* lisp/cedet/srecode/ctxt.el (srecode/dictionary): Require to
avoid compilation warning about unknown slot.  Remove function
declarations that point to that file.

srecode-inserter-prin-example compilation fix

* lisp/cedet/srecode/insert.el (srecode-inserter-prin-example):
Move prin1 example to file that defines the structure it prints.

Move functions from semantic.el to analyze.el to avoid warnings

* lisp/cedet/semantic.el (semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): Add
autoloads for the moved functions.

* lisp/cedet/semantic/analyze.el
(semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): Move
here from semantic.el to avoid getting compilation warnings about
unknown slot `bounds'.

Adjust erc functions after previous erc-pre-send-function change

Adjust erc functions after previous erc-pre-send-function change

* lisp/erc/erc-goodies.el (noncommands): Use
erc-pre-send-functions instead of the hook.
(erc-send-distinguish-noncommands): Adjust function to new interface.

* lisp/erc/erc-ring.el (ring): Ditto.
(erc-add-to-input-ring): Ditto.

* lisp/erc/erc.el (erc-send-this): Really make obsolete.
(erc-pre-send-functions): Change to a list of functions to allow
erc-goodies and erc-ring to work as before.

Unobsolete string-to-multibyte

* lisp/subr.el: Un-obsolete string-to-multibyte, because it's a
useful function.  string-to-unibyte has already been un-obsoleted.

Use CLOS-style accessors in oref/oset

* lisp/cedet/srecode/texi.el (srecode-semantic-handle-:texitag):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
(srecode-dump):
* lisp/cedet/srecode/srt-mode.el (srecode-parse-this-macro):
(semantic-analyze-possible-completions):
* lisp/cedet/srecode/semantic.el (srecode-compound-toString):
(srecode-semantic-apply-tag-to-dict-default):
* lisp/cedet/srecode/mode.el (srecode-minor-mode-templates-menu):
(srecode-edit):
* lisp/cedet/srecode/insert.el (srecode-insert-method):
(srecode-inserter-apply-state):
(srecode-insert-ask-default):
(srecode-insert-method-ask):
(srecode-insert-method-field):
(srecode-insert-method-helper):
(srecode-parse-input):
(srecode-match-end):
(srecode-insert-include-lookup):
(srecode-insert-method):
* lisp/cedet/srecode/find.el (srecode-template-table-in-project-p):
(srecode-template-get-table):
(srecode-template-get-table-for-binding):
(srecode-all-template-hash):
* lisp/cedet/srecode/extract.el (srecode-inserter-extract):
(srecode-inserter-extract):
* lisp/cedet/srecode/el.el (srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (initialize-instance):
(srecode-dictionary-add-template-table):
(srecode-compound-toString):
* lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/compile.el (srecode-compile-template-table):
(srecode-dump):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:project):
* lisp/cedet/semantic/texi.el (semantic-analyze-possible-completions):
* lisp/cedet/semantic/symref/list.el (semantic-symref-results-dump):
(semantic-symref-list-create-macro-on-open-hit):
(semantic-symref-list-rename-open-hits):
(semantic-symref-list-map-open-hits):
* lisp/cedet/semantic/symref/idutils.el
(semantic-symref-perform-search):
(semantic-symref-parse-tool-output-one-line):
* lisp/cedet/semantic/symref/global.el (semantic-symref-perform-search):
(semantic-symref-parse-tool-output-one-line):
* lisp/cedet/semantic/symref/cscope.el (semantic-symref-perform-search):
(semantic-symref-parse-tool-output-one-line):
* lisp/cedet/semantic/mru-bookmark.el
(semantic-mrub-ring-to-assoc-list):
* lisp/cedet/semantic/grammar.el
(semantic-analyze-possible-completions):
* lisp/cedet/semantic/decorate/include.el
(semantic-decoration-include-describe):
* lisp/cedet/semantic/debug.el (semantic-debug-highlight-lexical-token):
(semantic-debug-highlight-rule):
* lisp/cedet/semantic/db-typecache.el
(semanticdb-typecache-for-database):
* lisp/cedet/semantic/complete.el
(semantic-collector-calculate-completions-raw):
* lisp/cedet/semantic/bovine/make.el
(semantic-analyze-possible-completions):
* lisp/cedet/semantic/analyze/refs.el (semantic-analyze-refs-impl):
(semantic-analyze-refs-proto):
* lisp/cedet/semantic/analyze/debug.el
(semantic-analyzer-debug-describe-scope):
* lisp/cedet/semantic/analyze.el (semantic-analyze-interesting-tag):
(semantic-analyze-interesting-tag):
(semantic-analyze-pulse):
* lisp/cedet/ede/util.el (ede-update-version):
* lisp/cedet/ede/shell.el (ede-shell-run-something):
* lisp/cedet/ede/project-am.el (project-am-load-makefile):
(project-rescan):
(project-am-macro):
(ede-buffer-mine):
(project-compile-target-command):
(project-am-package-info):
* lisp/cedet/ede/files.el (ede--project-inode):
(ede-directory-get-open-project):
(ede-directory-get-toplevel-open-project):
(ede-find-subproject-for-directory):
(ede-toplevel-project):
* lisp/cedet/ede/cpp-root.el (initialize-instance):
(project-compile-project):
(project-compile-target):
* lisp/cedet/ede/config.el (ede-config-get-configuration):
(project-debug-target):
(project-run-target):
(project-compile-project):
(ede-preprocessor-map):
(ede-java-classpath):
* lisp/cedet/ede/base.el (ede-normalize-file/directory): Use
CLOS-style oref/oset accessors instead of eieio-style :colon
accessors.  This avoids compilation warnings and is allegedly
faster.

Obsolete erc-send-pre-hook and add new erc-pre-send-function

* lisp/erc/erc.el (erc-send-pre-hook): Make obsolete.
(erc-send-input): Ditto.
(erc-pre-send-function): New function.
(erc-send-input): Use the new function, and silence byte
compilation warning about the dynamic variable `str' used by the
now-obsolete hook.

Fix compilation warning in rmailmm

* lisp/mail/rmailmm.el (rmail-mime-insert-bulk): Remove apparently
superfluous call to string-as-unibyte -- the buffer should be
unibyte already at this point.

Avoid compilation warning in byte-run

* lisp/emacs-lisp/byte-run.el (macro-declaration-function): Avoid
compilation warning by not using `symbol-function'.

* lisp/gnus/message.el: Fix NNTP sending, broken by e51adfbdb7

(message-check-news-header-syntax): `message--check-continuation-headers`
signals an error instead of returning nil on error.

Remove failing test erroneously added in backport

* test/src/thread-tests.el (threads-test-bug33073): Remove
test which cannot work on the emacs-26 branch.  Do not merge
to master.  Reported by Juanma Barranquero <lekktu@gmail.com>.

* lisp/net/sieve-manage.el (sieve-manage-parse-capability): Doc fix.

Stop a tramp test leaving a file behind

* test/lisp/net/tramp-tests.el
(tramp-test10-write-region-file-precious-flag):
Avoid leaving a backup file after we are done.

* lisp/widget.el (define-widget-keywords): Use `declare`.

* lisp/progmodes/ps-mode.el (ps-mode-octal-region): Simplify.

Fix typo in object-print cleanup

* lisp/cedet/srecode/insert.el
(srecode-insert-variable-secondname-handler): Fix typo in
object-print cleanup.

Remove outdated FIXME

* lisp/emacs-lisp/eieio-core.el (eieio--slot-name-index): Remove
comment about issuing a byte compilation warning about accessing
slots via :initarg -- it was implemented a few months later.

semantic/senator.el byte compilation fix

* lisp/cedet/semantic/senator.el (semantic/analyze): Require to
avoid compilation warnings about unknown slots, and remove
declare-function.

semantic/idle.el compilation warning fix

* lisp/cedet/semantic/idle.el (semantic/analyze): Require to
avoid compilation warnings about unknown slots, and remove
declare-function.

semantic/grammar byte compilation fixes

* lisp/cedet/semantic/grammar.el (semantic/analyze): Require to
avoid compilation warnings about unknown slots, and remove
declare-function.

semantic/chart.el compilation warning fixes

* lisp/cedet/semantic/chart.el (semantic/db-typecache)
(semantic/scope): Require to avoid byte compilation warnings about
undefined slots.  Remove declare-functions from these packages.

Fix some cedet compilation warnings pertaining to semantic/db

* lisp/cedet/ede/config.el (semantic/db)
(ede-preprocessor-map): Ditto.

* lisp/cedet/ede/cpp-root.el (semantic/db): Ditto.

* lisp/cedet/ede/emacs.el (semantic/db): Ditto.

* lisp/cedet/ede/linux.el (semantic/db): Require to avoid warnings
about unknown slot lexical-table, and remove declare-functions
from the now-required semantic/db.

project.el compilation warning fix

* lisp/progmodes/project.el (xref--regexp-to-extended)
(xref--convert-hits): Declare more xref functions to avoid
compilation warnings.

Depessimize bits of CC Mode for long C macros.

* lisp/progmodes/cc-engine.el (c-end-of-macro): Check for being in a
degenerate zero length "macro", when setting the macro cache.
(c-determine-+ve-limit): Add in a missing goto-char form for when start-pos is
non-nil.
(c-back-over-member-initializers): Add a search limit parameter.

* lisp/progmodes/cc-fonts.el (c-get-fontification-context): Add a search limit
to c-go-up-list-backward.
(c-font-lock-cut-off-declarators): Add a search limit to
c-back-over-member-initializers.

* lisp/progmodes/cc-mode.el (c-before-change-check-unbalanced-strings): Don't
set c-new-END to the end of logical line (which might be a long macro).
(c-after-change-mark-abnormal-strings): Calculate end-hwm in place of the
setting of c-new-END (above).  Use this as a search limit rather than
c-new-END.

; * etc/NEWS: Small cleanup.

* etc/NEWS: Merge two bookmark items in NEWS (bug#36188).

Remove XEmacs support from bookmark.el

* lisp/bookmark.el (bookmark-store): Remove XEmacs compat code
(bug#36189).

Use cl-print-object instead of object-print throughout cedet

* lisp/cedet/semantic/db-find.el (semanticdb-find-log-activity):
Ditto.

* lisp/cedet/semantic/analyze/debug.el
(semantic-analyzer-debug-insert-include-summary): Ditto.

* lisp/cedet/semantic/bovine/c.el (semantic-c-describe-environment)
(semantic-c-describe-environment)
(semantic-c-describe-environment): Ditto.

* lisp/cedet/semantic/decorate/include.el
(semantic-decoration-fileless-include-describe): Ditto.
(semantic-decoration-all-include-summary): Ditto.

* lisp/cedet/srecode/insert.el
(srecode-insert-variable-secondname-handler): Use cl-print-object
instead of object-print.

erc-dcc.el minor clean-ups

* lisp/erc/erc-dcc.el: Remove outdated comments.
(erc-dcc-get-file): Remove XEmacs compat code.

Fix erc-dcc server-close code and fix compilation warning

* lisp/erc/erc-dcc.el (erc-dcc-get-filter): We receive unibyte
data, so no need to convert to unibyte.
(erc-dcc-send-filter): Kill the process before killing the buffer
so that we're not queried about killing the process.

Make erc-dcc-server work again by making synchronous

* lisp/erc/erc-dcc.el (erc-dcc-server): :server and :nowait can't
be mixed, so remove the :nowait.

Escape newlines when printing functions in timer list

* timer-list.el (list-timers): Bind `print-escape-newlines' to avoid
newlines in printed representation (bug#36187).

Compilation fix for previous change

Compilation warning fix for disass.el

* lisp/emacs-lisp/disass.el (disassemble-1): Remove a
string-as-unibyte that probably doesn't do anything, because the
string in question should be unibyte anyway.  If the assert fails,
revert the patch.

CC Mode: replace an erroneous re-search-forward with search-forward

Move two declarations to a more suitable point in the cc-engine.el.

* lisp/progmodes/cc-engine.el (c-after-change-unmark-raw-strings): Change an
re-search-forward to search-forward.
(c-semi-lit-near-cache, c-semi-near-cache-limit): Move the declarations.

Fix display of Hebrew text with precomposed characters

* lisp/language/hebrew.el (base): Include precomposed
Hebrew characters from the Alphabetic Presentation Forms in
the composition patterns.  (Bug#36171)

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Fix text shaping of precomposed characters with HarfBuzz

* src/hbfont.c (hbfont_shape): Fix setting TO of lglyph for
the case when Lisp shape-gstring function performed some
compositions by itself.  This happens with hebrew.el.  See
https://lists.freedesktop.org/archives/harfbuzz/2019-June/007396.html
for the details of the problem this solves.