mm-util.el (mm-with-unibyte-current-buffer): Don't emit a warning

We already get an obsolescence message.  Use `declare'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bcf8bc..ae4aab9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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".
 2015-02-04  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
        * nnir.el: Revert "Enable non-ASCII IMAP searches".

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index b2e0ee6..0b75901 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/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."
 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)
   (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
     (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)))))))
             (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."
 
 (defun mm-find-charset-region (b e)
   "Return a list of Emacs charsets in the region B to E."