From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 18 Oct 2020 07:42:25 +0000 (+0200)
Subject: Fix up smiley emoji application to make it reversible
X-Git-Tag: emacs-28.0.90~5560
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d96734729d0ed1fb854231c1ede3895c04c5b8ea;p=emacs.git

Fix up smiley emoji application to make it reversible

* lisp/gnus/smiley.el (smiley-region): Use text properties for the
emojis instead of rewriting the message.
---

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 7d6efacfe07..3edae04fcc0 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -227,7 +227,11 @@ A list of images is returned."
                   (progn
 	            (gnus-add-image 'smiley image)
 	            (gnus-put-image image string 'smiley))
-                (insert image)))))
+		;; This is a string, but mark the property for
+		;; deletion if the washing method is switched off.
+                (insert (propertize string
+				    'display image
+				    'gnus-image-category 'smiley))))))
 	images))))
 
 ;;;###autoload