X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/207f11935755236b21ca4d3fe6b19206e0a9ed33..b444e664d0a0be2eefe243345579bb0ebd08b112:/lisp/gnus/gnus-cite.el

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index d8ee35d3e9..aa3635fdf7 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
-;; Copyright (C) 1995-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
 
@@ -786,12 +786,12 @@ See also the documentation for `gnus-article-highlight-citation'."
 (defun gnus-cite-delete-overlays ()
   (dolist (overlay gnus-cite-overlay-list)
     (ignore-errors
-      (when (or (not (gnus-overlay-end overlay))
-		(and (>= (gnus-overlay-end overlay) (point-min))
-		     (<= (gnus-overlay-end overlay) (point-max))))
+      (when (or (not (overlay-end overlay))
+		(and (>= (overlay-end overlay) (point-min))
+		     (<= (overlay-end overlay) (point-max))))
 	(setq gnus-cite-overlay-list (delete overlay gnus-cite-overlay-list))
 	(ignore-errors
-	  (gnus-delete-overlay overlay))))))
+	  (delete-overlay overlay))))))
 
 (defun gnus-cite-parse-wrapper ()
   ;; Wrap chopped gnus-cite-parse.
@@ -1096,10 +1096,10 @@ See also the documentation for `gnus-article-highlight-citation'."
 	(skip-chars-backward " \t")
 	(setq to (point))
 	(when (< from to)
-	  (push (setq overlay (gnus-make-overlay from to nil t))
+	  (push (setq overlay (make-overlay from to nil t))
 		gnus-cite-overlay-list)
-	  (gnus-overlay-put overlay 'evaporate t)
-	  (gnus-overlay-put overlay 'face face))))))
+	  (overlay-put overlay 'evaporate t)
+	  (overlay-put overlay 'face face))))))
 
 (defun gnus-cite-toggle (prefix)
   (with-current-buffer gnus-article-buffer
@@ -1248,8 +1248,6 @@ When enabled, it automatically turns on `font-lock-mode'."
   "Turn off `gnus-message-citation-mode'."
   (gnus-message-citation-mode -1))
 
-(gnus-ems-redefine)
-
 (provide 'gnus-cite)
 
 ;; Local Variables: