diff options
| author | Lars Ingebrigtsen | 2016-02-10 09:53:13 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-10 09:59:07 +1100 |
| commit | a0e3180db181d1bc7ccb883f8f2b55e76a3703f2 (patch) | |
| tree | 335fc0ded1a66c8b662db9b61c51821ac4c499a3 | |
| parent | 8456ba1d493d5e5b46e450d0e8b2dd1577f246ab (diff) | |
| download | emacs-a0e3180db181d1bc7ccb883f8f2b55e76a3703f2.tar.gz emacs-a0e3180db181d1bc7ccb883f8f2b55e76a3703f2.zip | |
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.
| -rw-r--r-- | lisp/gnus/gnus-ems.el | 52 | ||||
| -rw-r--r-- | lisp/gnus/gnus-html.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sum.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mm-view.el | 3 |
4 files changed, 3 insertions, 56 deletions
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el index 400ac4f02bd..f72031b82dd 100644 --- a/lisp/gnus/gnus-ems.el +++ b/lisp/gnus/gnus-ems.el | |||
| @@ -209,58 +209,6 @@ | |||
| 209 | (setq start end | 209 | (setq start end |
| 210 | end nil)))))) | 210 | end nil)))))) |
| 211 | 211 | ||
| 212 | (defmacro gnus-string-mark-left-to-right (string) | ||
| 213 | (if (fboundp 'bidi-string-mark-left-to-right) | ||
| 214 | `(bidi-string-mark-left-to-right ,string) | ||
| 215 | string)) | ||
| 216 | |||
| 217 | (eval-and-compile | ||
| 218 | ;; XEmacs does not have window-inside-pixel-edges | ||
| 219 | (defalias 'gnus-window-inside-pixel-edges | ||
| 220 | (if (fboundp 'window-inside-pixel-edges) | ||
| 221 | 'window-inside-pixel-edges | ||
| 222 | 'window-pixel-edges)) | ||
| 223 | |||
| 224 | (if (or (featurep 'emacs) (fboundp 'set-process-plist)) | ||
| 225 | (progn ; these exist since Emacs 22.1 | ||
| 226 | (defalias 'gnus-set-process-plist 'set-process-plist) | ||
| 227 | (defalias 'gnus-process-plist 'process-plist) | ||
| 228 | (defalias 'gnus-process-get 'process-get) | ||
| 229 | (defalias 'gnus-process-put 'process-put)) | ||
| 230 | (defun gnus-set-process-plist (process plist) | ||
| 231 | "Replace the plist of PROCESS with PLIST. Returns PLIST." | ||
| 232 | (put 'gnus-process-plist-internal process plist)) | ||
| 233 | |||
| 234 | (defun gnus-process-plist (process) | ||
| 235 | "Return the plist of PROCESS." | ||
| 236 | ;; This form works but can't prevent the plist data from | ||
| 237 | ;; growing infinitely. | ||
| 238 | ;;(get 'gnus-process-plist-internal process) | ||
| 239 | (let* ((plist (symbol-plist 'gnus-process-plist-internal)) | ||
| 240 | (tem (memq process plist))) | ||
| 241 | (prog1 | ||
| 242 | (cadr tem) | ||
| 243 | ;; Remove it from the plist data. | ||
| 244 | (when tem | ||
| 245 | (if (eq plist tem) | ||
| 246 | (progn | ||
| 247 | (setcar plist (caddr plist)) | ||
| 248 | (setcdr plist (or (cdddr plist) '(nil)))) | ||
| 249 | (setcdr (nthcdr (- (length plist) (length tem) 1) plist) | ||
| 250 | (cddr tem))))))) | ||
| 251 | |||
| 252 | (defun gnus-process-get (process propname) | ||
| 253 | "Return the value of PROCESS' PROPNAME property. | ||
| 254 | This is the last value stored with `(gnus-process-put PROCESS PROPNAME VALUE)'." | ||
| 255 | (plist-get (gnus-process-plist process) propname)) | ||
| 256 | |||
| 257 | (defun gnus-process-put (process propname value) | ||
| 258 | "Change PROCESS' PROPNAME property to VALUE. | ||
| 259 | It can be retrieved with `(gnus-process-get PROCESS PROPNAME)'." | ||
| 260 | (gnus-set-process-plist process | ||
| 261 | (plist-put (gnus-process-plist process) | ||
| 262 | propname value))))) | ||
| 263 | |||
| 264 | (provide 'gnus-ems) | 212 | (provide 'gnus-ems) |
| 265 | 213 | ||
| 266 | ;;; gnus-ems.el ends here | 214 | ;;; gnus-ems.el ends here |
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 884b40e9342..9413d4e1b2a 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el | |||
| @@ -427,7 +427,7 @@ Return a string with image data." | |||
| 427 | 427 | ||
| 428 | (defun gnus-html-maximum-image-size () | 428 | (defun gnus-html-maximum-image-size () |
| 429 | "Return the maximum size of an image according to `gnus-max-image-proportion'." | 429 | "Return the maximum size of an image according to `gnus-max-image-proportion'." |
| 430 | (let ((edges (gnus-window-inside-pixel-edges | 430 | (let ((edges (window-inside-pixel-edges |
| 431 | (get-buffer-window (current-buffer))))) | 431 | (get-buffer-window (current-buffer))))) |
| 432 | ;; (width . height) | 432 | ;; (width . height) |
| 433 | (cons | 433 | (cons |
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index d675d2f6828..32680b29104 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." | |||
| 3720 | gnus-newsgroup-name)) 'nntp) | 3720 | gnus-newsgroup-name)) 'nntp) |
| 3721 | (gnus-group-real-name gnus-newsgroup-name)))) | 3721 | (gnus-group-real-name gnus-newsgroup-name)))) |
| 3722 | (concat gnus-summary-newsgroup-prefix newsgroups))))) | 3722 | (concat gnus-summary-newsgroup-prefix newsgroups))))) |
| 3723 | (gnus-string-mark-left-to-right | 3723 | (bidi-string-mark-left-to-right |
| 3724 | (inline | 3724 | (inline |
| 3725 | (gnus-summary-extract-address-component gnus-tmp-from)))))) | 3725 | (gnus-summary-extract-address-component gnus-tmp-from)))))) |
| 3726 | 3726 | ||
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index 8e1e3e782cf..ed163135f9c 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | (require 'mml-smime) | 31 | (require 'mml-smime) |
| 32 | 32 | ||
| 33 | (autoload 'gnus-completing-read "gnus-util") | 33 | (autoload 'gnus-completing-read "gnus-util") |
| 34 | (autoload 'gnus-window-inside-pixel-edges "gnus-ems") | ||
| 35 | (autoload 'gnus-article-prepare-display "gnus-art") | 34 | (autoload 'gnus-article-prepare-display "gnus-art") |
| 36 | (autoload 'vcard-parse-string "vcard") | 35 | (autoload 'vcard-parse-string "vcard") |
| 37 | (autoload 'vcard-format-string "vcard") | 36 | (autoload 'vcard-format-string "vcard") |
| @@ -88,7 +87,7 @@ | |||
| 88 | (if (eq mm-inline-large-images 'resize) | 87 | (if (eq mm-inline-large-images 'resize) |
| 89 | (gnus-rescale-image | 88 | (gnus-rescale-image |
| 90 | image | 89 | image |
| 91 | (let ((edges (gnus-window-inside-pixel-edges | 90 | (let ((edges (window-inside-pixel-edges |
| 92 | (get-buffer-window (current-buffer))))) | 91 | (get-buffer-window (current-buffer))))) |
| 93 | (cons (truncate (* mm-inline-large-images-proportion | 92 | (cons (truncate (* mm-inline-large-images-proportion |
| 94 | (- (nth 2 edges) (nth 0 edges)))) | 93 | (- (nth 2 edges) (nth 0 edges)))) |