diff options
| author | Michael Albinus | 2020-05-02 12:48:55 +0200 |
|---|---|---|
| committer | Michael Albinus | 2020-05-02 12:48:55 +0200 |
| commit | a941a9e8c226cff8eb77c4f8d7d0d54cb4a36340 (patch) | |
| tree | 85f38ce18d79b536ef83f14f39acffcf08065102 | |
| parent | 0ea1463e6796a5c0f8e10c4be0a891f417c0ae66 (diff) | |
| download | emacs-a941a9e8c226cff8eb77c4f8d7d0d54cb4a36340.tar.gz emacs-a941a9e8c226cff8eb77c4f8d7d0d54cb4a36340.zip | |
;; Revert recent change in tramp-cache.el
* lisp/net/tramp-cache.el (tramp-dump-connection-properties):
Remove compatibility code dumping the persistency file. Use
`emacs-lisp-mode' for backward compatibility.
| -rw-r--r-- | lisp/net/tramp-cache.el | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 6d87ce297bc..14a64382acb 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el | |||
| @@ -472,15 +472,10 @@ used to cache connection properties of the local machine." | |||
| 472 | ;; Dump it. | 472 | ;; Dump it. |
| 473 | (with-temp-file tramp-persistency-file-name | 473 | (with-temp-file tramp-persistency-file-name |
| 474 | (insert | 474 | (insert |
| 475 | ";; -*- lisp-data -*-" | 475 | ;; Starting with Emacs 28, we could use `lisp-data'. |
| 476 | ;; `time-stamp-string' might not exist in all Emacs flavors. | 476 | (format ";; -*- emacs-lisp -*- <%s %s>\n" |
| 477 | (condition-case nil | 477 | (time-stamp-string "%02y/%02m/%02d %02H:%02M:%02S") |
| 478 | (progn | 478 | tramp-persistency-file-name) |
| 479 | (format | ||
| 480 | " <%s %s>\n" | ||
| 481 | (time-stamp-string "%02y/%02m/%02d %02H:%02M:%02S") | ||
| 482 | tramp-persistency-file-name)) | ||
| 483 | (error "\n")) | ||
| 484 | ";; Tramp connection history. Don't change this file.\n" | 479 | ";; Tramp connection history. Don't change this file.\n" |
| 485 | ";; Run `M-x tramp-cleanup-all-connections' instead.\n\n" | 480 | ";; Run `M-x tramp-cleanup-all-connections' instead.\n\n" |
| 486 | (with-output-to-string | 481 | (with-output-to-string |