From dc05cf12062cb724acd72136d4679439656e3750 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 17 Oct 2019 14:06:24 +0200
Subject: [PATCH] Remove XEmacs compat code from imap.el
* lisp/net/imap.el (imap-disable-multibyte): Declare obsolete.
(imap-log, imap-open): Remove XEmacs compat code.
---
lisp/net/imap.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index eb963094212..71d19185ff3 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -454,8 +454,8 @@ sure of changing the value of `foo'."
(defmacro imap-disable-multibyte ()
"Enable multibyte in the current buffer."
- (unless (featurep 'xemacs)
- '(set-buffer-multibyte nil)))
+ (declare (obsolete nil "27.1"))
+ '(set-buffer-multibyte nil))
(defsubst imap-utf7-encode (string)
(if imap-use-utf7
@@ -495,7 +495,7 @@ sure of changing the value of `foo'."
(defun imap-log (string-or-buffer)
(when imap-log
(with-current-buffer (get-buffer-create imap-log-buffer)
- (imap-disable-multibyte)
+ (set-buffer-multibyte nil)
(buffer-disable-undo)
(goto-char (point-max))
(if (bufferp string-or-buffer)
@@ -1021,7 +1021,7 @@ necessary. If nil, the buffer name is generated."
(if (imap-opened buffer)
(imap-close buffer))
(mapc 'make-local-variable imap-local-variables)
- (imap-disable-multibyte)
+ (set-buffer-multibyte nil)
(buffer-disable-undo)
(setq imap-server (or server imap-server))
(setq imap-port (or port imap-port))
@@ -1044,7 +1044,7 @@ necessary. If nil, the buffer name is generated."
(with-current-buffer (get-buffer-create
(generate-new-buffer-name " *temp*"))
(mapc 'make-local-variable imap-local-variables)
- (imap-disable-multibyte)
+ (set-buffer-multibyte nil)
(buffer-disable-undo)
(setq imap-server (or server imap-server))
(setq imap-port (or port imap-port))
--
2.39.5