diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-11 15:27:45 +1100 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-11 15:27:45 +1100 |
commit | 1ff3e583f58be4c2b56000baa83ab3a738011ab3 (patch) | |
tree | 1afb74e9ea876e268b879bb8019437e3db754cb4 | |
parent | 35953890c59f3d7fc6abe4a5f4aefc4c0d005ad4 (diff) |
Remove Gnus XEmacs compat functions
* lisp/gnus/gnus-registry.el: Remove XEmacs compat.
* lisp/gnus/gnus-salt.el: Remove XEmacs compat.
* lisp/gnus/gnus-score.el (gnus-decay-score): Remove XEmacs compat.
-rw-r--r-- | lisp/gnus/gnus-registry.el | 6 | ||||
-rw-r--r-- | lisp/gnus/gnus-salt.el | 21 | ||||
-rw-r--r-- | lisp/gnus/gnus-score.el | 19 | ||||
-rw-r--r-- | lisp/gnus/gnus-spec.el | 4 |
4 files changed, 8 insertions, 42 deletions
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index f49eb0d85e..c636c7eb32 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -87,12 +87,6 @@ (require 'easymenu) (require 'registry) -;; Silence XEmacs byte compiler, which will otherwise complain about -;; call to `eieio-persistent-read'. -(when (featurep 'xemacs) - (byte-compiler-options - (warnings (- callargs)))) - (defvar gnus-adaptive-word-syntax-table) (defvar gnus-registry-dirty t diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el index 350921762a..b7af969bc2 100644 --- a/lisp/gnus/gnus-salt.el +++ b/lisp/gnus/gnus-salt.el @@ -25,9 +25,6 @@ ;;; Code: (eval-when-compile (require 'cl)) -(eval-when-compile - (when (featurep 'xemacs) - (require 'easy-mmode))) ; for `define-minor-mode' (require 'gnus) (require 'gnus-sum) @@ -47,9 +44,6 @@ :type 'hook :group 'gnus-summary-pick) -(when (featurep 'xemacs) - (add-hook 'gnus-pick-mode-hook 'gnus-xmas-pick-menu-add)) - (defcustom gnus-mark-unpicked-articles-as-read nil "*If non-nil, mark all unpicked articles as read." :type 'boolean @@ -100,11 +94,6 @@ It accepts the same format specs that `gnus-summary-line-format' does." ["Start reading" gnus-pick-start-reading t] ["Switch pick mode off" gnus-pick-mode gnus-pick-mode])))) -(eval-when-compile - (when (featurep 'xemacs) - (defvar gnus-pick-mode-on-hook) - (defvar gnus-pick-mode-off-hook))) - (define-minor-mode gnus-pick-mode "Minor mode for providing a pick-and-read interface in Gnus summary buffers. @@ -339,11 +328,6 @@ This must be bound to a button-down mouse event." '("Pick" ["Switch binary mode off" gnus-binary-mode t])))) -(eval-when-compile - (when (featurep 'xemacs) - (defvar gnus-binary-mode-on-hook) - (defvar gnus-binary-mode-off-hook))) - (define-minor-mode gnus-binary-mode "Minor mode for providing a binary group interface in Gnus summary buffers." :lighter " Binary" :keymap gnus-binary-mode-map @@ -419,11 +403,6 @@ Two predefined functions are available: :type 'hook :group 'gnus-summary-tree) -(when (featurep 'xemacs) - (add-hook 'gnus-tree-mode-hook 'gnus-xmas-tree-menu-add) - (add-hook 'gnus-tree-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off)) - - ;;; Internal variables. (defvar gnus-tmp-name) diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index b486a05db0..82a804933b 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el @@ -3050,19 +3050,12 @@ If ADAPT, return the home adaptive file instead." (defun gnus-decay-score (score) "Decay SCORE according to `gnus-score-decay-constant' and `gnus-score-decay-scale'." - (let ((n (- score - (* (if (< score 0) -1 1) - (min (abs score) - (max gnus-score-decay-constant - (* (abs score) - gnus-score-decay-scale))))))) - (if (and (featurep 'xemacs) - ;; XEmacs's floor can handle only the floating point - ;; number below the half of the maximum integer. - (> (abs n) (lsh -1 -2))) - (string-to-number - (car (split-string (number-to-string n) "\\."))) - (floor n)))) + (floor (- score + (* (if (< score 0) -1 1) + (min (abs score) + (max gnus-score-decay-constant + (* (abs score) + gnus-score-decay-scale))))))) (defun gnus-decay-scores (alist day) "Decay non-permanent scores in ALIST." diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el index 8e8b5d4e24..7c1fdf2223 100644 --- a/lisp/gnus/gnus-spec.el +++ b/lisp/gnus/gnus-spec.el @@ -29,13 +29,13 @@ (require 'gnus) -(defcustom gnus-use-correct-string-widths (featurep 'xemacs) +(defcustom gnus-use-correct-string-widths nil "*If non-nil, use correct functions for dealing with wide characters." :version "22.1" :group 'gnus-format :type 'boolean) -(defcustom gnus-make-format-preserve-properties (featurep 'xemacs) +(defcustom gnus-make-format-preserve-properties nil "*If non-nil, use a replacement `format' function which preserves text properties. This is only needed on XEmacs, as Emacs does this anyway." :version "22.1" |