2 files changed, 6 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b4cc3412cd5..841cff57ea2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mm-util.el (mm-with-unibyte-current-buffer): Don't emit a warning
+        message, since we already get an obsolescence message.  Use `declare'.
+
 2015-02-04  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
         * nnir.el: Revert "Enable non-ASCII IMAP searches".
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index b2e0ee66d9c..0b7590114c4 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1241,9 +1241,9 @@ better ways to do a similar thing.  The previous version of this macro
 bound the default value of `enable-multibyte-characters' to nil while
 evaluating FORMS but it is no longer done.  So, some programs assuming
 it if any may malfunction."
+  (declare (obsolete nil "25.1") (indent 0) (debug t))
   (if (featurep 'xemacs)
       `(progn ,@forms)
-    (message "Warning: Using brain-dead macro `mm-with-unibyte-current-buffer'!")
     (let ((multibyte (make-symbol "multibyte")))
       `(let ((,multibyte enable-multibyte-characters))
          (when ,multibyte
@@ -1252,9 +1252,6 @@ it if any may malfunction."
              (progn ,@forms)
            (when ,multibyte
              (set-buffer-multibyte t)))))))
-(put 'mm-with-unibyte-current-buffer 'lisp-indent-function 0)
-(put 'mm-with-unibyte-current-buffer 'edebug-form-spec '(body))
-(make-obsolete 'mm-with-unibyte-current-buffer nil "25.1")
 
 (defun mm-find-charset-region (b e)
   "Return a list of Emacs charsets in the region B to E."