GitLab

* lisp/net/tramp.el (tramp-get-buffer)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory, tramp-handle-file-remote-p)
(tramp-handle-file-truename, tramp-handle-find-backup-file-name)
(tramp-handle-insert-file-contents):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-get-remote-uid, tramp-gvfs-get-remote-gid)
(tramp-gvfs-maybe-open-connection):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename)
(tramp-sh-handle-expand-file-name, )
(tramp-sh-handle-process-file, tramp-get-remote-path):
* lisp/net/tramp-smb.el (tramp-smb-handle-expand-file-name)
(tramp-smb-handle-process-file): Make `tramp-make-tramp-file-name'
calls consistent.

After previous commit, all tests using helper function
`replace-tests-clauses' fail: during the expansion
of macro `replace-tests-with-undo', the function
`replace-tests-clauses' is unbound.

Delete those helpers and reimplement test
`query-replace-undo-bug31538'.
* test/lisp/replace-tests.el (query-replace-undo-bug31538):
Reimplement this test without using any helper function/macro.

* lisp/replace.el (perform-replace): Update the replacement string
after the user edit it (Fix Bug#31538).

* test/lisp/replace-tests.el (replace-tests-clauses): New function.
(replace-tests-bind-read-string): New variable.
(replace-tests-with-undo): Macro to create boilerplate code.
(query-replace-undo-bug31073): Use it.
(query-replace-undo-bug31538): New test.

07f8f9bc (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
5cec2b03 * etc/HISTORY: Update for Emacs 26.1 release.
7c474e1c * etc/AUTHORS: Update.
ddc7bea7 ; * ChangeLog.3: Update.
35574609 ; * admin/authors.el: Update.
2f44d2d5 Note caveat for backward regexp searching in docstring (Bug#3...
3145d08c Update backtrace in Emacs Lisp Intro
43a9c268 Move window-point in bibtex-search-entry
4bb2741b More fixes of Intro to Emacs Lisp
c57c2268 ; * doc/emacs/misc.texi (FFAP): Fix a typo.  (Bug#31580)
0a511133 Add a footnote to Emacs Lisp Intro
5eabe4a0 ; * doc/emacs/msdos.texi (ls in Lisp): Fix a typo.  (Bug#31575)
d5e0ceb8 * lisp/help.el (with-help-window): Doc fix.  (Bug#31574)
e7952bdf Fix some cross-references in emacs-lisp-intro.texi
a8979594 Minor copyedits in Emacs manual in macos.texi

Conflicts:
	lisp/ldefs-boot.el

* src/search.c (Fre_search_backward): Emphasize that backwards
searches may give shorter than expected matches.
* doc/lispref/searching.texi (Regexp Search): Add an anchor for
re-search-backward to reference.

* doc/lispintro/emacs-lisp-intro.texi (Making Errors): Update the
backtrace to match Emacs 26.  (Bug#31589)

* lisp/textmodes/bibtex.el (bibtex-search-entry): Move window-point
to record found.

* doc/lispintro/emacs-lisp-intro.texi (Finding More): Tell the
reader how to invoke 'M-.' without a tags table.  Add a
cross-reference to the Emacs manual for when a tags table does
need to be created.
(append save-excursion): Rephrase a confusing sentence.
(Bug#31578)

* doc/lispintro/emacs-lisp-intro.texi (Run a Program): Describe
the detailed output of integer value evaluation in a footnote, to
prevent confusion.  (Bug#31579)

* lisp/net/tramp.el (tramp-handle-file-name-directory): Fix case
of localname starts w/o a slash.

* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Extend test.

* lisp/net/tramp.el (tramp-mode, tramp-verbose)
(tramp-backup-directory-alist, tramp-auto-save-directory)
(tramp-encoding-shell, tramp-encoding-command-switch)
(tramp-encoding-command-interactive, tramp-default-method)
(tramp-default-method-alist, tramp-default-user)
(tramp-default-user-alist, tramp-default-host)
(tramp-default-host-alist, tramp-default-proxies-alist)
(tramp-save-ad-hoc-proxies, tramp-restricted-shell-hosts-alist)
(tramp-local-host-regexp, tramp-local-end-of-line)
(tramp-rsh-end-of-line, tramp-login-prompt-regexp)
(tramp-shell-prompt-pattern, tramp-password-prompt-regexp)
(tramp-wrong-passwd-regexp, tramp-yesno-prompt-regexp)
(tramp-yn-prompt-regexp, tramp-terminal-prompt-regexp)
(tramp-operation-not-permitted-regexp, tramp-copy-failed-regexp)
(tramp-process-alive-regexp, tramp-ignored-file-name-regexp)
(tramp-chunksize, tramp-process-connection-type)
(tramp-connection-timeout, tramp-connection-min-time-diff)
(tramp-completion-reread-directory-timeout)
* lisp/net/tramp-adb.el (tramp-adb-program)
(tramp-adb-connect-if-not-connected, tramp-adb-prompt):
* lisp/net/tramp-cache.el (tramp-connection-properties)
(tramp-persistency-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods)
(tramp-gvfs-zeroconf-domain)
(tramp-bluez-discover-devices-timeout):
* lisp/net/tramp-sh.el (tramp-inline-compress-start-size)
(tramp-copy-size-limit, tramp-terminal-type)
(tramp-histfile-override, tramp-use-ssh-controlmaster-options)
(tramp-remote-path, tramp-remote-process-environment)
(tramp-sh-extra-args):
* lisp/net/tramp-smb.el (tramp-smb-program, tramp-smb-acl-program)
(tramp-smb-conf, tramp-smb-winexe-program)
(tramp-smb-winexe-shell-command)
(tramp-smb-winexe-shell-command-switch):
Dont't require 'tramp.  (Bug#31558)

* lisp/net/tramp.el (tramp-ignored-file-name-regexp): Use type regexp.

* doc/lispintro/emacs-lisp-intro.texi (List Processing)
(Determining the Element, graph-body-print): Fix cross-references
to subsections that don't exist in the printed version of the
manual.  (Bug#31567)

* doc/emacs/macos.texi (Mac / GNUstep Basics)
(Mac / GNUstep Events): Fix markup and capitalization.
(Bug#31568)

* src/print.c (print_check_string_charset_prop): Move check
for nil Vprint_charset_text_property from here...
(print_prune_string_charset): ... to here.
(syms_of_print) <print-charset-text-property>: Clarify that any
non-boolean values are treated the same as `default'.
* doc/lispref/streams.texi (Output Variables): Add
print-prune-string-charset.
* test/src/print-tests.el (print-charset-text-property-nil)
(print-charset-text-property-default)
(print-charset-text-property-t): New tests.
(print-tests--prints-with-charset-p): New helper function.

* lisp/progmodes/gud.el (gud-common-init): Use `display-buffer'
instead of `switch-to-buffer'.

* lisp/epa.el (epa-pinentry-mode): Make into obsolete alias for...
* lisp/epg-config.el (epg-pinentry-mode): ...this new user option.
* lisp/epg.el (epg-context): Use it as the default value for
pinentry-mode.
* etc/NEWS: Announce name change.

* lisp/epa-file.el (epa-file-insert-file-contents)
(epa-file-write-region):
* lisp/epa.el (epa-decrypt-file, epa-sign-file)
(epa-encrypt-file, epa-decrypt-region)
(epa-sign-region, epa-encrypt-region): Don't change
epg-context-pinentry-mode from the default.

* lisp/epa.el (epa--select-safe-coding-system): Remove,
`select-safe-coding-system' has been present since Emacs 20.3.
(epa--encode-coding-string, epa--decode-coding-string):
* lisp/epg.el (epg--decode-coding-string, epg--encode-coding-string)
(epg--clear-string): Remove, the corresponding Emacs functions are so
old they don't show up in NEWS.  Furthermore, the fallback for
the *-coding-string functions was `identity' which wouldn't have
worked anyway, since it only takes a single argument.
(epg--make-temp-file): Remove, `make-temp-file' has been present since
Emacs 21.1.
* lisp/epg-config.el (epg-gpg-program, epg-gpgsm-program)
(epg-gpgconf-program, epg-gpg-home-directory)
(epg-passphrase-coding-system, epg-debug): Remove unneeded :group
parameter.

This commit fixes Bug#31492.
* lisp/replace.el (replace-match-maybe-edit): Preserve match data.

* test/lisp/replace-tests.el (query-replace-undo-bug31492): Add test.

e3f00f56 (origin/emacs-26) Clarify when to use advice-add vs add-function
c0f3e6b5 Minor formatting tweak in the Emacs manual
fadf6535 Update comments in Intro to Emacs Lisp
52ccb24a ; * doc/os.texi (Batch Mode): use = after --eval
d65430f6 * etc/NEWS: Mention change in `edebug-prin1-to-string'.
ef4aec14 ; * doc/lispref/hash.texi (Defining Hash): Fix typos.
2981952b Another attempt to fix sql.el
b1b96d7c Update binding of 'M-.' in Intro to Emacs Lisp
b239a096 Fix a typo in last change in sql.el
0d8bae5c Fix capitalization of mail headers
845fe038 Fix buffer names in sql.el
a3885f56 Minor fixes in the Emacs manual
542f8302 Fix a typo in rmail.texi
eb0bc6f7 * etc/PROBLEMS: Document Bug#31305.

Conflicts:
	doc/emacs/sending.texi
	etc/NEWS

The following commit was skipped:

152a5569 (gnus-blocked-images): Clarify privacy implications

73bc6f86 Fix a typo in describing input methods
6b4bafed ; Add a comment to emacs-lisp-intro.texi

* lisp/emacs-lisp/nadvice.el (add-function): Note in docstring that
advice-add should be used for named functions.

* test/lisp/electric-tests.el (electric-pair-define-test-form):
Improve automatically generated docstring.

* src/alloc.c (PNTR_ADD): Put attributes after ‘static’ and before
returned type.  Problem reported by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2018-05/msg00559.html

Problem reported by Philipp Stephani (Bug#31556).
* src/lread.c (read_vector): When load_force_doc_strings, check
for byte code vectors that are invalid because they are too short.
* test/src/lread-tests.el (lread-invalid-bytecodes): New test.

* doc/emacs/custom.texi (Directory Variables): Don't have 2
footnotes back to back, it looks bad in HTML.  (Bug#31555)

* doc/lispintro/emacs-lisp-intro.texi: Explain in the comments
what are roman page numbers in Preface about.  (Bug#31541)

* src/xwidget.c (webkit_javascript_finished_cb)
(Fxwidget_webkit_execute_script): Use intptr_t to avoid warnings
in the (unlikely) event that ptrdiff_t and void * differ in width.
(save_script_callback): Simplify by using xlispdstrdup and
larger_vector.

* lisp/net/secrets.el (secrets-search-item-paths): New function.
(secrets-search-items): Use it.
(secrets-create-item): Adapt docstring.

* test/lisp/net/secrets-tests.el (secrets-test04-search): Extend test.