Mercurial > vim
comparison src/os_unix.c @ 15298:4aea6c2f56a8 v8.1.0657
patch 8.1.0657: get error for using regexp recursively
commit https://github.com/vim/vim/commit/01e51e5b305c13c68b5ea2b9e14779e1e88664ef
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 29 13:09:46 2018 +0100
patch 8.1.0657: get error for using regexp recursively
Problem: Get error for using regexp recursively. (Dominique Pelle)
Solution: Do no check if connection is desired.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 29 Dec 2018 13:15:05 +0100 |
| parents | 60e962106f8a |
| children | 7fff2d18e191 |
comparison
equal
deleted
inserted
replaced
| 15297:137d5ee732e0 | 15298:4aea6c2f56a8 |
|---|---|
| 1740 * (e.g. through tmux). | 1740 * (e.g. through tmux). |
| 1741 */ | 1741 */ |
| 1742 static void | 1742 static void |
| 1743 may_restore_clipboard(void) | 1743 may_restore_clipboard(void) |
| 1744 { | 1744 { |
| 1745 // Only try restoring if we want the connection. | 1745 // No point in restoring the connecting if we are exiting or dying. |
| 1746 if (x_connect_to_server() && xterm_dpy_retry_count > 0) | 1746 if (!exiting && !v_dying && xterm_dpy_retry_count > 0) |
| 1747 { | 1747 { |
| 1748 --xterm_dpy_retry_count; | 1748 --xterm_dpy_retry_count; |
| 1749 | 1749 |
| 1750 # ifndef LESSTIF_VERSION | 1750 # ifndef LESSTIF_VERSION |
| 1751 /* This has been reported to avoid Vim getting stuck. */ | 1751 /* This has been reported to avoid Vim getting stuck. */ |