Remove Gnus compat functions

* lisp/gnus/gnus-ems.el (gnus-mark-active-p)
(gnus-region-active-p, gnus-select-lowest-window)
(gnus-summary-display-table, gnus-max-width-function): Remove
compat functions.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 238a67f55324879187de4e6907726dee6ac5fb2d..147c258b4ba3c8805094c7c931d93c76e8af1abb 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6980,7 +6980,7 @@ the entire article will be yanked."
   (interactive)
   (let ((article (cdr gnus-article-current))
        contents)
-    (if (not (gnus-region-active-p))
+    (if (not (and transient-mark-mode mark-active))
        (with-current-buffer gnus-summary-buffer
          (gnus-summary-reply (list (list article)) wide))
       (setq contents (buffer-substring (point) (mark t)))
@@ -7006,7 +7006,7 @@ the entire article will be yanked."
   (interactive)
   (let ((article (cdr gnus-article-current))
        contents)
-      (if (not (gnus-region-active-p))
+      (if (not (and transient-mark-mode mark-active))
          (with-current-buffer gnus-summary-buffer
            (gnus-summary-followup (list (list article))))
        (setq contents (buffer-substring (point) (mark t)))

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index a4c091e4de75a33695c997cbdfb30402a2ed865b..0c18f022bf9b2c34ea1a2560209e70cb00b183e9 100644 (file)
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -86,9 +86,6 @@
 
 (defun gnus-ems-redefine ()
   (cond
-   ((featurep 'xemacs)
-    (gnus-xmas-redefine))
-
    ((featurep 'mule)
     ;; Mule and new Emacs definitions
 
@@ -108,10 +105,6 @@
     ;; (featurep 'xemacs).  In this case, the implementation for
     ;; XEmacs/mule may be shareable between XEmacs and XEmacs/mule.
 
-    (defvar gnus-summary-display-table nil
-      "Display table used in summary mode buffers.")
-    (defalias 'gnus-max-width-function 'gnus-mule-max-width-function)
-
     (when (boundp 'gnus-check-before-posting)
       (setq gnus-check-before-posting
            (delq 'long-lines
@@ -121,7 +114,7 @@
       (insert gnus-tmp-unread gnus-tmp-replied
              gnus-tmp-score-char gnus-tmp-indentation)
       (put-text-property
-       (point)
+g       (point)
        (progn
         (insert
          gnus-tmp-opening-bracket
@@ -135,29 +128,6 @@
        gnus-mouse-face-prop gnus-mouse-face)
       (insert " " gnus-tmp-subject-or-nil "\n")))))
 
-;; Clone of `appt-select-lowest-window' in appt.el.
-(defun gnus-select-lowest-window ()
-"Select the lowest window on the frame."
-  (let ((lowest-window (selected-window))
-       (bottom-edge (nth 3 (window-edges))))
-    (walk-windows (lambda (w)
-                   (let ((next-bottom-edge (nth 3 (window-edges w))))
-                     (when (< bottom-edge next-bottom-edge)
-                       (setq bottom-edge next-bottom-edge
-                             lowest-window w)))))
-    (select-window lowest-window)))
-
-(defun gnus-region-active-p ()
-  "Say whether the region is active."
-  (and (boundp 'transient-mark-mode)
-       transient-mark-mode
-       (boundp 'mark-active)
-       mark-active))
-
-(defun gnus-mark-active-p ()
-  "Non-nil means the mark and region are currently active in this buffer."
-  mark-active) ; aliased to region-exists-p in XEmacs.
-
 (provide 'gnus-ems)
 
 ;;; gnus-ems.el ends here

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 1cd16a4e043b362ff79c9814bd30a77fcc951878..8b81c877bda37e81b438f81689f3cb6140e669c4 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -905,14 +905,14 @@ simple manner.")
              (memq (gnus-group-group-name) gnus-group-marked))]
        ["Unmark all" gnus-group-unmark-all-groups gnus-group-marked]
        ["Mark regexp..." gnus-group-mark-regexp t]
-       ["Mark region" gnus-group-mark-region :active (gnus-mark-active-p)]
+       ["Mark region" gnus-group-mark-region :active mark-active]
        ["Mark buffer" gnus-group-mark-buffer t]
        ["Execute command" gnus-group-universal-argument
         (or gnus-group-marked (gnus-group-group-name))])
        ("Subscribe"
        ["Subscribe to a group..." gnus-group-unsubscribe-group t]
        ["Kill all newsgroups in region" gnus-group-kill-region
-        :active (gnus-mark-active-p)]
+        :active mark-active]
        ["Kill all zombie groups" gnus-group-kill-all-zombies
         gnus-zombie-list]
        ["Kill all groups on level..." gnus-group-kill-level t])
@@ -2028,7 +2028,7 @@ Take into consideration N (the prefix) and the list of marked groups."
          (setq n (1- n))
          (gnus-group-next-group way)))
       (nreverse groups)))
-   ((and (gnus-region-active-p) (mark))
+   ((and transient-mark-mode mark-active (mark))
     ;; Work on the region between point and mark.
     (let ((max (max (point) (mark)))
          groups)

diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index d3a1139902b986e414c449b5b8a26aded8a62618..b486a05db09db7597d9e2f0dccbef98f77dcfc2c 100644 (file)
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -739,6 +739,8 @@ current score file."
       (with-current-buffer gnus-summary-buffer
        (gnus-score-load-file current-score-file)))))
 
+(autoload 'appt-select-lowest-window "appt")
+
 (defun gnus-score-insert-help (string alist idx)
   (setq gnus-score-help-winconf (current-window-configuration))
   (with-current-buffer (gnus-get-buffer-create "*Score Help*")
@@ -773,7 +775,7 @@ current score file."
        (setq i (1+ i))))
     (goto-char (point-min))
     ;; display ourselves in a small window at the bottom
-    (gnus-select-lowest-window)
+    (appt-select-lowest-window)
     (if (< (/ (window-height) 2) window-min-height)
        (switch-to-buffer "*Score Help*")
       (split-window)

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 32680b291046b86f677a15741d85e7b05217e438..b02e8fd52d22885094d872cda614191a9b197cbe 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2706,8 +2706,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
         ["Catchup all" gnus-summary-catchup-all t]
         ["Catchup to here" gnus-summary-catchup-to-here t]
         ["Catchup from here" gnus-summary-catchup-from-here t]
-        ["Catchup region" gnus-summary-mark-region-as-read
-         (gnus-mark-active-p)]
+        ["Catchup region" gnus-summary-mark-region-as-read mark-active]
         ["Mark excluded" gnus-summary-limit-mark-excluded-as-read t])
        ("Mark Various"
         ["Tick" gnus-summary-tick-article-forward t]
@@ -2746,8 +2745,8 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
         ["Invert marks" gnus-uu-invert-processable t]
         ["Mark above" gnus-uu-mark-over t]
         ["Mark series" gnus-uu-mark-series t]
-        ["Mark region" gnus-uu-mark-region (gnus-mark-active-p)]
-        ["Unmark region" gnus-uu-unmark-region (gnus-mark-active-p)]
+        ["Mark region" gnus-uu-mark-region mark-active]
+        ["Unmark region" gnus-uu-unmark-region mark-active]
         ["Mark by regexp..." gnus-uu-mark-by-regexp t]
         ["Unmark by regexp..." gnus-uu-unmark-by-regexp t]
         ["Mark all" gnus-uu-mark-all t]
@@ -6681,7 +6680,7 @@ current article will be taken into consideration."
                     (gnus-summary-find-next nil article)))
            (decf n)))
        (nreverse articles)))
-     ((and (gnus-region-active-p) (mark))
+     ((and (and transient-mark-mode mark-active) (mark))
       (message "region active")
       ;; Work on the region between point and mark.
       (let ((max (max (point) (mark)))
@@ -10834,7 +10833,7 @@ If N is negative, mark backward instead.  If UNMARK is non-nil, remove
 the process mark instead.  The difference between N and the actual
 number of articles marked is returned."
   (interactive "P")
-  (if (and (null n) (gnus-region-active-p))
+  (if (and (null n) (and transient-mark-mode mark-active))
       (gnus-uu-mark-region (region-beginning) (region-end) unmark)
     (setq n (prefix-numeric-value n))
     (let ((backward (< n 0))

diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 24ae4cfae48f2b4de0e627cbae17f8116d53c89d..35d0f3896e0d5017ac2adccb95cd4bf185b26b2b 100644 (file)
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1294,7 +1294,7 @@ If COPYP, copy the groups instead."
    (list current-prefix-arg
         (gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t
                               nil 'gnus-topic-history)))
-  (let ((use-marked (and (not n) (not (gnus-region-active-p))
+  (let ((use-marked (and (not n) (not (and transient-mark-mode mark-active))
                         gnus-group-marked t))
        (groups (gnus-group-process-prefix n))
        (topicl (assoc topic gnus-topic-alist))
@@ -1319,7 +1319,7 @@ If COPYP, copy the groups instead."
 (defun gnus-topic-remove-group (&optional n)
   "Remove the current group from the topic."
   (interactive "P")
-  (let ((use-marked (and (not n) (not (gnus-region-active-p))
+  (let ((use-marked (and (not n) (not (and transient-mark-mode mark-active))
                         gnus-group-marked t))
        (groups (gnus-group-process-prefix n)))
     (mapc