From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 9 Feb 2016 22:53:13 +0000 (+1100)
Subject: Remove some Gnus compat functions
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/a0e3180db181d1bc7ccb883f8f2b55e76a3703f2

Remove some Gnus compat functions

* lisp/gnus/gnus-ems.el (gnus-string-mark-left-to-right)
(gnus-window-inside-pixel-edges, gnus-set-process-plist)
(gnus-process-plist, gnus-process-get, gnus-process-put): Remove.
---

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 400ac4f02b..f72031b82d 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -209,58 +209,6 @@
 	  (setq start end
 		end nil))))))
 
-(defmacro gnus-string-mark-left-to-right (string)
-  (if (fboundp 'bidi-string-mark-left-to-right)
-      `(bidi-string-mark-left-to-right ,string)
-    string))
-
-(eval-and-compile
-  ;; XEmacs does not have window-inside-pixel-edges
-  (defalias 'gnus-window-inside-pixel-edges
-    (if (fboundp 'window-inside-pixel-edges)
-        'window-inside-pixel-edges
-      'window-pixel-edges))
-
-  (if (or (featurep 'emacs) (fboundp 'set-process-plist))
-      (progn				; these exist since Emacs 22.1
-	(defalias 'gnus-set-process-plist 'set-process-plist)
-	(defalias 'gnus-process-plist 'process-plist)
-	(defalias 'gnus-process-get 'process-get)
-	(defalias 'gnus-process-put 'process-put))
-    (defun gnus-set-process-plist (process plist)
-      "Replace the plist of PROCESS with PLIST.  Returns PLIST."
-      (put 'gnus-process-plist-internal process plist))
-
-    (defun gnus-process-plist (process)
-      "Return the plist of PROCESS."
-      ;; This form works but can't prevent the plist data from
-      ;; growing infinitely.
-      ;;(get 'gnus-process-plist-internal process)
-      (let* ((plist (symbol-plist 'gnus-process-plist-internal))
-	     (tem (memq process plist)))
-	(prog1
-	    (cadr tem)
-	  ;; Remove it from the plist data.
-	  (when tem
-	    (if (eq plist tem)
-		(progn
-		  (setcar plist (caddr plist))
-		  (setcdr plist (or (cdddr plist) '(nil))))
-	      (setcdr (nthcdr (- (length plist) (length tem) 1) plist)
-		      (cddr tem)))))))
-
-    (defun gnus-process-get (process propname)
-      "Return the value of PROCESS' PROPNAME property.
-This is the last value stored with `(gnus-process-put PROCESS PROPNAME VALUE)'."
-      (plist-get (gnus-process-plist process) propname))
-
-    (defun gnus-process-put (process propname value)
-      "Change PROCESS' PROPNAME property to VALUE.
-It can be retrieved with `(gnus-process-get PROCESS PROPNAME)'."
-      (gnus-set-process-plist process
-			      (plist-put (gnus-process-plist process)
-					 propname value)))))
-
 (provide 'gnus-ems)
 
 ;;; gnus-ems.el ends here
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 884b40e934..9413d4e1b2 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -427,7 +427,7 @@ Return a string with image data."
 
 (defun gnus-html-maximum-image-size ()
   "Return the maximum size of an image according to `gnus-max-image-proportion'."
-  (let ((edges (gnus-window-inside-pixel-edges
+  (let ((edges (window-inside-pixel-edges
                 (get-buffer-window (current-buffer)))))
     ;; (width . height)
     (cons
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index d675d2f682..32680b2910 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3720,7 +3720,7 @@ buffer that was in action when the last article was fetched."
 				gnus-newsgroup-name)) 'nntp)
 		      (gnus-group-real-name gnus-newsgroup-name))))
 	      (concat gnus-summary-newsgroup-prefix newsgroups)))))
-     (gnus-string-mark-left-to-right
+     (bidi-string-mark-left-to-right
       (inline
 	(gnus-summary-extract-address-component gnus-tmp-from))))))
 
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 8e1e3e782c..ed163135f9 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -31,7 +31,6 @@
 (require 'mml-smime)
 
 (autoload 'gnus-completing-read "gnus-util")
-(autoload 'gnus-window-inside-pixel-edges "gnus-ems")
 (autoload 'gnus-article-prepare-display "gnus-art")
 (autoload 'vcard-parse-string "vcard")
 (autoload 'vcard-format-string "vcard")
@@ -88,7 +87,7 @@
        (if (eq mm-inline-large-images 'resize)
            (gnus-rescale-image
 	    image
-	    (let ((edges (gnus-window-inside-pixel-edges
+	    (let ((edges (window-inside-pixel-edges
 			  (get-buffer-window (current-buffer)))))
 	      (cons (truncate (* mm-inline-large-images-proportion
 				 (- (nth 2 edges) (nth 0 edges))))