diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-13 17:58:41 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-13 17:58:41 +1100 |
| commit | ea03ab9662b4e4f317c5dbcc3cbbd8c435bdc97f (patch) | |
| tree | d1efa15ef5e04dd716299bd532a3b826a5ae6cba | |
| parent | 9efc29a2dfda67c2e6b6693a6cb06a19fbdccaeb (diff) | |
| download | emacs-ea03ab9662b4e4f317c5dbcc3cbbd8c435bdc97f.tar.gz emacs-ea03ab9662b4e4f317c5dbcc3cbbd8c435bdc97f.tar.bz2 emacs-ea03ab9662b4e4f317c5dbcc3cbbd8c435bdc97f.zip | |
Remove compat code from gnus-uu and win
* lisp/gnus/gnus-util.el (gnus-image-type-available-p): Remove
compat code.
* lisp/gnus/gnus-uu.el (gnus-uu-tmp-dir): Remove compat code.
* lisp/gnus/gnus-win.el (gnus-frames-on-display-list): Remove.
| -rw-r--r-- | lisp/gnus/gnus-util.el | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-uu.el | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-win.el | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 5e6b66dfb4b..170404c0299 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1734,10 +1734,7 @@ lists of strings." ;;; Image functions. (defun gnus-image-type-available-p (type) - (and (fboundp 'image-type-available-p) - (if (fboundp 'display-images-p) - (display-images-p) - t) + (and (display-images-p) (image-type-available-p type))) (defun gnus-create-image (file &optional type data-p &rest props) diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 6a0c8f950b9..f199d1659d9 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -217,11 +217,8 @@ Note that this variable can be used in conjunction with the ;; Various variables users may set -(defcustom gnus-uu-tmp-dir - (cond ((fboundp 'temp-directory) (temp-directory)) - ((boundp 'temporary-file-directory) temporary-file-directory) - ("/tmp/")) - "*Variable saying where gnus-uu is to do its work. +(defcustom gnus-uu-tmp-dir temporary-file-directory + "Variable saying where gnus-uu is to do its work. Default is \"/tmp/\"." :group 'gnus-extract :type 'directory) diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index c17ccd6858d..9c950a9e3e9 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el @@ -508,18 +508,11 @@ should have point." (mapcar (lambda (b) (delete-windows-on b t)) (delq lowest-buf bufs))))) -(eval-and-compile - (cond - ((fboundp 'frames-on-display-list) - (defalias 'gnus-frames-on-display-list 'frames-on-display-list)) - (t - (defalias 'gnus-frames-on-display-list 'frame-list)))) - (defun gnus-get-buffer-window (buffer &optional frame) (cond ((and (null gnus-use-frames-on-any-display) (memq frame '(t 0 visible))) (car - (let ((frames (gnus-frames-on-display-list))) + (let ((frames (frames-on-display-list))) (gnus-remove-if (lambda (win) (not (memq (window-frame win) frames))) (get-buffer-window-list buffer nil frame))))) |