diff options
| author | Johan Bockgård | 2016-08-18 21:25:11 +0200 |
|---|---|---|
| committer | Johan Bockgård | 2016-08-18 21:29:48 +0200 |
| commit | 8fcf3df9395a3b1196fd5c95aeebba9e75f69247 (patch) | |
| tree | bd2ccd3d624ca7ccef6ed5370bf867b5ccff96af | |
| parent | b305fab44c10488e601096d506a30259961e8d7f (diff) | |
| download | emacs-8fcf3df9395a3b1196fd5c95aeebba9e75f69247.tar.gz emacs-8fcf3df9395a3b1196fd5c95aeebba9e75f69247.zip | |
Fix bug in --eval reply message from server
* lisp/server.el (server-reply-print): Fix check for truncated quote
sequence at end of message. Problem reported in:
http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00101.html
| -rw-r--r-- | lisp/server.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index e4cf4312570..53009849e25 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -784,7 +784,7 @@ This handles splitting the command if it would be bigger than | |||
| 784 | ;; We have to split the string | 784 | ;; We have to split the string |
| 785 | (setq part (substring qtext 0 (- server-msg-size (length prefix) 1))) | 785 | (setq part (substring qtext 0 (- server-msg-size (length prefix) 1))) |
| 786 | ;; Don't split in the middle of a quote sequence | 786 | ;; Don't split in the middle of a quote sequence |
| 787 | (if (string-match "\\(^\\|[^&]\\)\\(&&\\)+$" part) | 787 | (if (string-match "\\(^\\|[^&]\\)&\\(&&\\)*$" part) |
| 788 | ;; There is an uneven number of & at the end | 788 | ;; There is an uneven number of & at the end |
| 789 | (setq part (substring part 0 -1))) | 789 | (setq part (substring part 0 -1))) |
| 790 | (setq qtext (substring qtext (length part))) | 790 | (setq qtext (substring qtext (length part))) |