]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove some Message compat functions
authorLars Ingebrigtsen <larsi@gnus.org>
Sat, 13 Feb 2016 08:00:04 +0000 (19:00 +1100)
committerLars Ingebrigtsen <larsi@gnus.org>
Sat, 13 Feb 2016 08:00:04 +0000 (19:00 +1100)
* lisp/gnus/message.el (message-kill-all-overlays): Define
unconditionally.
(message-window-inside-pixel-edges): Remove.
(mail-dont-reply-to): Remove.

lisp/gnus/message.el

index 0a806467058bec85288992308e36832c7c6e9731..9ab44fab12d027cc64d2647a0aad3bf8aecf5313 100644 (file)
@@ -1936,20 +1936,8 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 (autoload 'rmail-msg-is-pruned "rmail")
 (autoload 'rmail-output "rmailout")
 
-;; Emacs < 24.1 do not have mail-dont-reply-to
-(unless (fboundp 'mail-dont-reply-to)
-  (defalias 'mail-dont-reply-to 'rmail-dont-reply-to))
-
-(eval-and-compile
-  (if (featurep 'emacs)
-      (progn
-       (defun message-kill-all-overlays ()
-         (mapcar #'delete-overlay (overlays-in (point-min) (point-max))))
-       (defalias 'message-window-inside-pixel-edges
-         'window-inside-pixel-edges))
-    (defun message-kill-all-overlays ()
-      (map-extents (lambda (extent ignore) (delete-extent extent))))
-    (defalias 'message-window-inside-pixel-edges 'ignore)))
+(defun message-kill-all-overlays ()
+  (mapcar #'delete-overlay (overlays-in (point-min) (point-max))))
 
 \f
 
@@ -8510,7 +8498,7 @@ Used in `message-simplify-recipients'."
        (goto-char (point-min))
        (while (re-search-forward "<img.*src=\"\\([^\"]+\\)" nil t)
          (let ((file (match-string 1))
-               (edges (message-window-inside-pixel-edges
+               (edges (window-inside-pixel-edges
                        (get-buffer-window (current-buffer)))))
            (put-image
             (create-image