Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / gnus-salt.el

diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 350921762a8dce402931e63eaed42312f71e5b52..fc85bd69baf0faf40f5799824ea3cdcef7ce79d0 100644 (file)
--- 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.
 
@@ -229,7 +218,7 @@ This must be bound to a button-down mouse event."
         (start-point (posn-point start-posn))
          (start-line (1+ (count-lines (point-min) start-point)))
         (start-window (posn-window start-posn))
-        (bounds (gnus-window-edges start-window))
+        (bounds (window-edges start-window))
         (top (nth 1 bounds))
         (bottom (if (window-minibuffer-p start-window)
                     (nth 3 bounds)
@@ -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)
@@ -639,7 +618,7 @@ Two predefined functions are available:
                (t (cdar gnus-tree-brackets))))
         (buffer-read-only nil)
         beg end)
-    (gnus-add-text-properties
+    (add-text-properties
      (setq beg (point))
      (setq end (progn (eval gnus-tree-line-format-spec) (point)))
      (list 'gnus-number gnus-tmp-number))
@@ -855,8 +834,7 @@ it in the environment specified by BINDINGS."
          region)
       (set-buffer gnus-tree-buffer)
       (when (setq region (gnus-tree-article-region article))
-       (when (or (not gnus-selected-tree-overlay)
-                 (gnus-extent-detached-p gnus-selected-tree-overlay))
+       (when (not gnus-selected-tree-overlay)
          ;; Create a new overlay.
          (overlay-put
           (setq gnus-selected-tree-overlay
@@ -885,7 +863,7 @@ it in the environment specified by BINDINGS."
     (with-current-buffer (gnus-get-tree-buffer)
       (let (region)
        (when (setq region (gnus-tree-article-region article))
-         (gnus-put-text-property (car region) (cdr region) 'face face)
+         (put-text-property (car region) (cdr region) 'face face)
          (set-window-point
           (gnus-get-buffer-window (current-buffer) t) (cdr region)))))))