diff options
| author | Glenn Morris | 2018-08-10 11:37:11 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-08-10 11:37:11 -0700 |
| commit | bd6b6cdb62aac5be34a8bb367f43d8367fc341f8 (patch) | |
| tree | b5386b322b0b247ab44eefd12e1fa865844249f7 /test/lisp | |
| parent | 506ea8a2f70d8c9d53a34ea9469d3edbe6655f0c (diff) | |
| parent | 71c92d89137b7fdde6c2bd4bed9b8dfda5fa53dd (diff) | |
| download | emacs-bd6b6cdb62aac5be34a8bb367f43d8367fc341f8.tar.gz emacs-bd6b6cdb62aac5be34a8bb367f43d8367fc341f8.zip | |
Merge from origin/emacs-26
71c92d8 Fix copying text properties by 'format'
96be6b6 Improve error messages regarding initial-buffer-choice (Bug#2...
00fb127 * test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01):...
Conflicts:
lisp/startup.el
Diffstat (limited to 'test/lisp')
| -rw-r--r-- | test/lisp/wdired-tests.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el index b4ef4ab2486..f1ec4afb6c5 100644 --- a/test/lisp/wdired-tests.el +++ b/test/lisp/wdired-tests.el | |||
| @@ -116,13 +116,13 @@ wdired-mode." | |||
| 116 | (kill-region (point) (progn (search-forward ".") | 116 | (kill-region (point) (progn (search-forward ".") |
| 117 | (forward-char -1) (point))) | 117 | (forward-char -1) (point))) |
| 118 | (insert replace) | 118 | (insert replace) |
| 119 | (should (equal (dired-get-filename) new-file)))) | 119 | (should (equal (dired-get-filename) new-file))) |
| 120 | (when buf | 120 | (when buf |
| 121 | (with-current-buffer buf | 121 | (with-current-buffer buf |
| 122 | ;; Prevent kill-buffer-query-functions from chiming in. | 122 | ;; Prevent kill-buffer-query-functions from chiming in. |
| 123 | (set-buffer-modified-p nil) | 123 | (set-buffer-modified-p nil) |
| 124 | (kill-buffer buf))) | 124 | (kill-buffer buf))) |
| 125 | (delete-directory test-dir t)))) | 125 | (delete-directory test-dir t))))) |
| 126 | 126 | ||
| 127 | 127 | ||
| 128 | (provide 'wdired-tests) | 128 | (provide 'wdired-tests) |