Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index bca307b19b66fbdd8d43b7af2bd9598c0bb05f6e..af278b4427d5bb6d5124206ab3c90e3e670cf275 100644 (file)
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -1,6 +1,6 @@
 ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus back end
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
@@ -83,13 +83,10 @@ There are currently two built-in format functions:
 
 ;; Compatibility functions ==================================================
 
-(eval-and-compile
-  (if (fboundp 'kill-entire-line)
-      (defalias 'gnus-diary-kill-entire-line 'kill-entire-line)
-    (defun gnus-diary-kill-entire-line ()
-      (beginning-of-line)
-      (let ((kill-whole-line t))
-       (kill-line)))))
+(defun gnus-diary-kill-entire-line ()
+  (beginning-of-line)
+  (let ((kill-whole-line t))
+    (kill-line)))
 
 
 ;; Summary line format ======================================================