summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Instead of a json-serialize-use-plists global, use function argsscratch/support-plists-in-jsoncJoão Távora2018-05-303-53/+49
| | | | | | | | | | | | | | | * src/json.c (syms_of_json): Don't defive json-serialize-use-plists (Fjson_insert, lisp_to_json, list_to_json_toplevel_1) (list_to_json_toplevel, Fjson_serialize): Use and pass around use_plists arg. * doc/lispref/text.texi: (Parsing JSON): json-serialize and json-insert now have a USE-PLISTS arg. * test/src/json-tests.el (json-serialize/object): Use json-serialize's USE-PLISTS arg.
* Support plists in json.cJoão Távora2018-05-293-32/+110
| | | | | | | | | | | | | | | | | | | * doc/lispref/text.texi (Parsing JSON): Mention plists and json-serialize-use-plists. * src/json.c (lisp_to_json_toplevel_1): Decide with Vjson_serialize_use_plists. (Fjson_serialize): Update docstring. (enum json_object_type): Add json_object_plist. (json_to_lisp): Can build plists. (json_parse_object_type): Accept plists. (Fjson_parse_string): Update docstring. (json-serialize-use-plist): New DEFVAR_LISP. (Qplist): New sym_of_json * test/src/json-tests.el (json-serialize/object): Do some tests with json-serialize-use-plists to t. (json-parse-string/object): Parse something as a plist.
* * doc/misc/tramp.texi (All): Use @code instead of @option for user options.Michael Albinus2018-05-291-1/+1
|
* Merge from origin/emacs-26Michael Albinus2018-05-291-59/+121
|\ | | | | | | | | 13963a3a5c * doc/misc/tramp.texi (All): Use @code instead of @option ... 6e5f19ada4 Fix Bug#31605
| * * doc/misc/tramp.texi (All): Use @code instead of @option for user options.Michael Albinus2018-05-291-55/+55
| |
| * Fix Bug#31605Michael Albinus2018-05-291-5/+67
| | | | | | | | | | | | | | | | * doc/misc/tramp.texi (All): Add @vindex entries for environment variables. (Remote shell setup): New items `tramp-terminal-type' and "Determining a Tramp session". (Frequently Asked Questions): Adapt zsh example. (Bug#31605)
* | ; Merge from origin/emacs-26Michael Albinus2018-05-290-0/+0
|\ \ | |/ | | | | | | | | The following commit was skipped: e8912d5be9 Sync with Tramp 2.3.4-pre
| * Sync with Tramp 2.3.4-preMichael Albinus2018-05-2910-196/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/misc/trampver.texi: Change version to "2.3.4-pre * 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-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-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-accept-process-output): * lisp/net/tramp-adb.el (tramp-adb-handle-start-file-process): * lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band) (tramp-sh-handle-start-file-process): * lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory) (tramp-smb-handle-file-acl, tramp-smb-handle-process-file) (tramp-smb-handle-set-file-acl) (tramp-smb-handle-start-file-process): Suppress timers. * lisp/net/tramp-adb.el (tramp-adb-handle-write-region): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-write-region): * lisp/net/tramp-sh.el (tramp-sh-handle-write-region): * lisp/net/tramp-smb.el (tramp-smb-handle-write-region): Write proper message. * lisp/net/tramp-cmds.el (tramp-change-syntax): Use `customize-set-variable'. * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): Ensure proper EOL handling for Darwin. (tramp-find-inline-compress): Improve command quoting for w32. Reported by Chris Zheng <chriszheng99@gmail.com>. (tramp-open-connection-setup-interactive-shell): Wrap both echo calls in parentheses, in order to avoid double prompt. * lisp/net/tramp-smb.el (tramp-smb-errors): Add "NT_STATUS_RESOURCE_NAME_NOT_FOUND". * lisp/net/tramp.el (tramp-default-user-alist) (tramp-default-host-alist): Fix docstring. (tramp-dissect-file-name): Adapt docstring. (Bug#30904) (tramp-make-tramp-file-name): Check, that method is not empty. (Bug#30038) (tramp-message-show-message): Change default. * lisp/net/trampver.el: Change version to "2.3.4-pre". * test/lisp/net/tramp-tests.el (ert-x): Require it. (tramp-test10-write-region): Extend test. (tramp--test-emacs27-p, tramp--test-windows-nt): New defuns. (tramp-test11-copy-file, tramp-test12-rename-file) (tramp-test21-file-links, tramp-test24-file-acl) (tramp-test25-file-selinux, tramp--test-check-files): Use them. (tramp-test21-file-links): Do not call `make-symbolic-link' on w32. Fix file name quoting test. (tramp-test32-environment-variables-and-port-numbers): Adapt check for systems which do not support "echo -n". (Bug#29712) (tramp-test36-find-backup-file-name): Call also `convert-standard-filename' due to w32. (tramp-test41-asynchronous-requests): Use $REMOTE_PARALLEL_PROCESSES. Flush cache prior file operations. (tramp-test42-auto-load, tramp-test42-delay-load) (tramp-test42-recursive-load, tramp-test42-remote-load-path): Quote command due to w32.
* | Merge from origin/emacs-26Michael Albinus2018-05-291-2/+0
|\ \ | |/ | | | | 9a7a2e919a ; ChangeLog.3: Remove stray phrase.
| * ; ChangeLog.3: Remove stray phrase.Noam Postavsky2018-05-281-2/+0
| |
* | ; Merge from origin/emacs-26Michael Albinus2018-05-290-0/+0
|\ \ | |/ | | | | | | | | The following commit was skipped: 038063651e Bump Emacs version to 26.1.50
| * Bump Emacs version to 26.1.50Eli Zaretskii2018-05-284-4/+4
| | | | | | | | | | | | | | * msdos/sed2v2.inp: * nt/README.W32: * configure.ac: * README: Bump Emacs version to 26.1.50.
* | Merge from origin/emacs-26Michael Albinus2018-05-297-285/+850
|\ \ | |/ | | | | | | | | | | | | 9d6a3ac73a Mention pcase as a fifth conditional form 567cb9046d Overhaul pcase documentation 4d7e54acff Use EXPVAL in docstrings of patterns defined using pcase-d... 7e8227ed68 Introduce EXPVAL for pcase, pcase-defmacro docstrings e6de5b3d51 Ensure pcase doc shows `QPAT first among extensions
| * Mention pcase as a fifth conditional formfix/bug-31311-pcase-doc-squashThien-Thi Nguyen2018-05-271-2/+4
| | | | | | | | | | * doc/lispref/control.texi (Conditionals): ...here, in first para, w/ xref to "Pattern-Matching Conditional".
| * Overhaul pcase documentationThien-Thi Nguyen2018-05-273-263/+805
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested by Drew Adams (Bug#31311). * doc/lispref/control.texi (Control Structures): Add "Pattern-Matching Conditional" to menu, before "Iteration". (Conditionals): Delete menu. (Pattern matching case statement): Delete node/subsection, by actually moving, renaming, and overhauling it to... (Pattern-Matching Conditional): ...new node/section. (pcase Macro): New node/subsection. (Extending pcase): Likewise. (Backquote Patterns): Likewise. * doc/lispref/elisp.texi (Top) In @detailmenu, add "Pattern-Matching Conditional" under "Control Structures" section and delete "Conditionals" section. * lisp/emacs-lisp/pcase.el (pcase): Rewrite docstring. (pcase-defmacro \` (qpat) ...): Likewise.
| * Use EXPVAL in docstrings of patterns defined using pcase-defmacroThien-Thi Nguyen2018-05-274-9/+11
| | | | | | | | | | | | | | | | | | Suggested by Drew Adams (Bug#31311). * lisp/emacs-lisp/cl-macs.el (cl-struct): ...here. * lisp/emacs-lisp/eieio.el (eieio): Likewise. * lisp/emacs-lisp/radix-tree.el (radix-tree-leaf): Likewise. * lisp/emacs-lisp/rx.el (rx): Likewise.
| * Introduce EXPVAL for pcase, pcase-defmacro docstringsThien-Thi Nguyen2018-05-271-2/+6
| | | | | | | | | | | | | | | | | | Suggested by Drew Adams (Bug#31311). * lisp/emacs-lisp/pcase.el (pcase): Use EXPVAL in docstring to stand for the result of evaluating EXP. (pcase-defmacro): Add (fn ...) form in docstring that includes [DOC], and the EXPVAL convention.
| * Ensure pcase doc shows `QPAT first among extensionsThien-Thi Nguyen2018-05-271-9/+24
| | | | | | | | | | | | | | * lisp/emacs-lisp/pcase.el (pcase--make-docstring): Split extensions display into two phases, collection and display, separated by a reordering step that ensures backquote is the first.
* | Make cl-print respect print-level and print-length (bug#31559)Gemini Lasswell2018-05-272-47/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/cl-print.el (cl-print--depth): New variable. (cl-print-object) <cons>: Print ellipsis if printing depth greater than 'print-level' or length of list greater than 'print-length'. (cl-print-object) <vector>: Truncate printing with ellipsis if vector is longer than 'print-length'. (cl-print-object) <cl-structure-object>: Truncate printing with ellipsis if structure has more slots than 'print-length'. (cl-print-object) <:around>: Bind 'cl-print--depth'. * test/lisp/emacs-lisp/cl-print-tests.el (cl-print-tests-3, cl-print-tests-4): New tests.
* | Place epg-pinentry-mode varalias before defcustomBasil L. Contovounesios2018-05-272-3/+2
| | | | | | | | | | | | | | This is needed to avoid losing user settings made under the obsolete name (Bug#31603). * lisp/epa.el (epa-pinentry-mode): Move obsolete varalias from here... * lisp/epg-config.el (epg-pinentry-mode): ...to here.
* | Port .gdbinit to unsigned-pointer platformsPaul Eggert2018-05-261-1/+1
| | | | | | | | | | | | * src/.gdbinit (Lisp_Object_Printer.to_string): Don’t assume that GDB treats C pointers as signed integers. Problem found with GDB Fedora 8.1-15.fc28.
* | GNOME moved URLs for its active bug reportsPaul Eggert2018-05-267-10/+10
| | | | | | | | | | | | | | * src/emacs.c (main) [USE_GTK]: * src/gtkutil.c (xg_display_close): * src/xterm.c (x_connection_closed): Update GNOME bug report URLs.
* | Don’t set EMACS=t if Bash is 4.4 or newerPaul Eggert2018-05-261-6/+28
| | | | | | | | | | | | | | (Thanks to Stefan Monnier for improvements to this patch.) * lisp/term.el (term--bash-needs-EMACS-status): New var. (term--bash-needs-EMACSp): New function. (term-exec-1): Use it instead of always setting EMACS.
* | replace-tests.el: Refactor undo testsTino Calancha2018-05-271-69/+82
| | | | | | | | | | | | | | * test/lisp/replace-tests.el (replace-tests-bind-read-string): New variable. (replace-tests-with-undo): Add helper macro to generate the boilerplate code. (replace-tests--query-replace-undo, query-replace-undo-bug31073) (query-replace-undo-bug31492, query-replace-undo-bug31538): Use it.
* | ; * etc/NEWS: Call out recently removed aliases in epa.el.Eli Zaretskii2018-05-261-1/+10
| |
* | Make `tramp-make-tramp-file-name' calls consistent.Michael Albinus2018-05-264-65/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | * etc/HELLO: Add a few more scripts.Eli Zaretskii2018-05-261-2/+13
| |
* | replace-tests.el: Fix broken testsTino Calancha2018-05-261-86/+69
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | query-replace undo: Handle when user edits the replacement stringTino Calancha2018-05-262-50/+90
| | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge from origin/emacs-26Glenn Morris2018-05-2512-101/+649
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07f8f9b (origin/emacs-26) ; * lisp/ldefs-boot.el: Update. 5cec2b0 * etc/HISTORY: Update for Emacs 26.1 release. 7c474e1 * etc/AUTHORS: Update. ddc7bea ; * ChangeLog.3: Update. 3557460 ; * admin/authors.el: Update. 2f44d2d Note caveat for backward regexp searching in docstring (Bug#3... 3145d08 Update backtrace in Emacs Lisp Intro 43a9c26 Move window-point in bibtex-search-entry 4bb2741 More fixes of Intro to Emacs Lisp c57c226 ; * doc/emacs/misc.texi (FFAP): Fix a typo. (Bug#31580) 0a51113 Add a footnote to Emacs Lisp Intro 5eabe4a ; * doc/emacs/msdos.texi (ls in Lisp): Fix a typo. (Bug#31575) d5e0ceb * lisp/help.el (with-help-window): Doc fix. (Bug#31574) e7952bd Fix some cross-references in emacs-lisp-intro.texi a897959 Minor copyedits in Emacs manual in macos.texi Conflicts: lisp/ldefs-boot.el
| * ; * lisp/ldefs-boot.el: Update.emacs-26.1Nicolas Petton2018-05-251-21/+14
| |
| * * etc/HISTORY: Update for Emacs 26.1 release.Nicolas Petton2018-05-251-0/+2
| |
| * * etc/AUTHORS: Update.Nicolas Petton2018-05-251-72/+69
| |
| * ; * ChangeLog.3: Update.Nicolas Petton2018-05-251-1/+522
| |
| * ; * admin/authors.el: Update.Nicolas Petton2018-05-251-1/+1
| |
| * Note caveat for backward regexp searching in docstring (Bug#31584)Noam Postavsky2018-05-252-1/+6
| | | | | | | | | | | | | | * 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.
| * Update backtrace in Emacs Lisp IntroEli Zaretskii2018-05-251-3/+5
| | | | | | | | | | * doc/lispintro/emacs-lisp-intro.texi (Making Errors): Update the backtrace to match Emacs 26. (Bug#31589)
| * Move window-point in bibtex-search-entryRoland Winkler2018-05-241-1/+1
| | | | | | | | | | * lisp/textmodes/bibtex.el (bibtex-search-entry): Move window-point to record found.
| * More fixes of Intro to Emacs LispEli Zaretskii2018-05-241-6/+15
| | | | | | | | | | | | | | | | | | * 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/emacs/misc.texi (FFAP): Fix a typo. (Bug#31580)Eli Zaretskii2018-05-241-1/+1
| |
| * Add a footnote to Emacs Lisp IntroEli Zaretskii2018-05-241-5/+7
| | | | | | | | | | | | * 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)
| * ; * doc/emacs/msdos.texi (ls in Lisp): Fix a typo. (Bug#31575)Eli Zaretskii2018-05-241-1/+1
| |
| * * lisp/help.el (with-help-window): Doc fix. (Bug#31574)Eli Zaretskii2018-05-241-2/+2
| |
| * Fix some cross-references in emacs-lisp-intro.texiEli Zaretskii2018-05-231-5/+15
| | | | | | | | | | | | | | * 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)
| * Minor copyedits in Emacs manual in macos.texiEli Zaretskii2018-05-231-2/+2
| | | | | | | | | | | | * doc/emacs/macos.texi (Mac / GNUstep Basics) (Mac / GNUstep Events): Fix markup and capitalization. (Bug#31568)
* | Fix file name completion in TrampMichael Albinus2018-05-242-7/+11
| | | | | | | | | | | | | | | | * 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.
* | Fix Bug#31558Michael Albinus2018-05-246-114/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Honor print-charset-text-property value of nil (Bug#31376)Noam Postavsky2018-05-233-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Avoid messing up buffer list when starting gud (Bug#22374)Michael Welsh Duggan2018-05-231-1/+6
| | | | | | | | | | * lisp/progmodes/gud.el (gud-common-init): Use `display-buffer' instead of `switch-to-buffer'.
* | Move epa-pinentry-mode to epg-config (Bug#26298)Noam Postavsky2018-05-235-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.