[Emacs-diffs] emacs-25 6816bff 1/2: Ensure that Gnus dribble handling allows removing entries

[Lars Ingebrigtsen]

branch: emacs-25
commit 6816bfffceb0b5de18a2e364dd9aa47c328c34fe
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Ensure that Gnus dribble handling allows removing entries
    
    * lisp/gnus/gnus-start.el (gnus-dribble-enter): Ensure that each
    entry is on a single line.
---
 lisp/gnus/gnus-start.el |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 10f93d8..34a5ff6 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -862,7 +862,9 @@ If REGEXP is given, lines that match it will be deleted."
            (goto-char (match-beginning 0))
            (delete-region (point-at-bol) end))))
       (goto-char (point-max))
-      (insert string "\n")
+      ;; Make sure that each dribble entry is a single line, so that
+      ;; the "remove" code above works.
+      (insert (replace-regexp-in-string "\n" "\\\\n" string) "\n")
       ;; This has been commented by Josh Huber <address@hidden>
       ;; It causes problems with both XEmacs and Emacs 21, and doesn't
       ;; seem to be of much value. (FIXME: remove this after we make sure