X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=598e09a61f86e3fae44d3222784654dc224f174b;hb=4bf0cd3dd241b469e6507cc12f788f1ea73906af;hp=c3506066ad1c4402351586dbe5fbbbd53cfc42e3;hpb=1097cc612b25ecfecfd662db7b7e1caed72f02cc;p=gnus

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index c3506066a..598e09a61 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -1,6 +1,6 @@
 ;;; gnus-xmas.el --- Gnus functions for XEmacs
 
-;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -106,16 +104,6 @@ Possibly the `etc' directory has not been installed.")))
 (defvar gnus-agent-summary-mode)
 (defvar gnus-draft-mode)
 
-(defun gnus-xmas-highlight-selected-summary ()
-  ;; Highlight selected article in summary buffer
-  (when gnus-summary-selected-face
-    (when gnus-newsgroup-selected-overlay
-      (delete-extent gnus-newsgroup-selected-overlay))
-    (setq gnus-newsgroup-selected-overlay
-	  (make-extent (point-at-bol) (point-at-eol)))
-    (set-extent-face gnus-newsgroup-selected-overlay
-		     gnus-summary-selected-face)))
-
 (defcustom gnus-xmas-force-redisplay nil
   "*If non-nil, force a redisplay before recentering the summary buffer.
 This is ugly, but it works around a bug in `window-displayed-height'."
@@ -223,6 +211,10 @@ call it with the value of the `gnus-data' text property."
 		 (delete-extent extent)
 		 nil)))
 
+(defun gnus-xmas-overlays-at (pos)
+  "Return a list of the extents that contain the character at POS."
+  (mapcar-extents #'identity nil nil pos (1+ pos)))
+
 (defun gnus-xmas-overlays-in (beg end)
   "Return a list of the extents that overlap the region BEG ... END."
   (mapcar-extents #'identity nil nil beg end))
@@ -411,6 +403,7 @@ then we display only bindings that start with that prefix."
 FRONT-ADVANCE and REAR-ADVANCE are ignored."
       (make-extent beg end buffer)))
 
+  (defalias 'gnus-copy-overlay 'copy-extent)
   (defalias 'gnus-delete-overlay 'delete-extent)
   (defalias 'gnus-overlay-get 'extent-property)
   (defalias 'gnus-overlay-put 'set-extent-property)
@@ -418,6 +411,7 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
   (defalias 'gnus-overlay-buffer 'extent-object)
   (defalias 'gnus-overlay-start 'extent-start-position)
   (defalias 'gnus-overlay-end 'extent-end-position)
+  (defalias 'gnus-overlays-at 'gnus-xmas-overlays-at)
   (defalias 'gnus-overlays-in 'gnus-xmas-overlays-in)
   (defalias 'gnus-kill-all-overlays 'gnus-xmas-kill-all-overlays)
   (defalias 'gnus-extent-detached-p 'extent-detached-p)
@@ -430,9 +424,8 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
   (unless (fboundp 'member-ignore-case)
     (defun member-ignore-case (elt list)
       (while (and list
-		  (not (and (stringp (car list))
-			    (eq t (compare-strings elt 0 nil (car list)
-						   0 nil t)))))
+		  (or (not (stringp (car list)))
+		      (not (string= (downcase elt) (downcase (car list))))))
 	(setq list (cdr list)))
       list))
 
@@ -441,13 +434,6 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
 
   (defvar gnus-mouse-face-prop 'highlight)
 
-  (defun gnus-byte-code (func)
-    "Return a form that can be `eval'ed based on FUNC."
-    (let ((fval (indirect-function func)))
-      (if (compiled-function-p fval)
-	  (list 'funcall fval)
-	(cons 'progn (cdr (cdr fval))))))
-
   (unless (fboundp 'match-string-no-properties)
     (defalias 'match-string-no-properties 'match-string))
 
@@ -761,11 +747,6 @@ XEmacs compatibility workaround."
       nil
     (mail-strip-quoted-names address)))
 
-(defun gnus-xmas-call-region (command &rest args)
-  (apply
-   'call-process-region (point-min) (point-max) command t '(t nil) nil
-   args))
-
 (defvar gnus-xmas-modeline-left-extent
   (let ((ext (copy-extent modeline-buffer-id-left-extent)))
     ext))