From: Glenn Morris <rgm@gnu.org>
Date: Fri, 23 Mar 2018 20:28:24 +0000 (-0400)
Subject: Remove some declare-function stub definitions
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc2d36aa140a915a7a47d7de6ed17d145ec33871;p=emacs.git

Remove some declare-function stub definitions

* lisp/emulation/viper-cmd.el, lisp/emulation/viper-keym.el:
* lisp/emulation/viper-util.el, lisp/net/newst-plainview.el:
* lisp/net/newst-treeview.el, lisp/ps-def.el, lisp/vc/ediff.el:
* lisp/vc/ediff-util.el, lisp/vc/ediff-wind.el:
Remove stub declare-function definitions.
It exists since Emacs 22.2, released 10 years ago.
Most of these files are using even newer features, such as
lexical-binding and cl-lib anyway, making the stubs pointless.
---

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 224ce5802c6..3c66abe3e56 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -45,8 +45,6 @@
 (defvar undo-beg-posn)
 (defvar undo-end-posn)
 
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest _))))
 ;; end pacifier
 
 
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index e72842232e4..5196ca6ac38 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -32,8 +32,6 @@
 (defvar viper-ex-style-editing)
 (defvar viper-ex-style-motion)
 
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
 ;; end pacifier
 
 (require 'viper-util)
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 9fd68b7a61f..2e759bc13be 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -42,9 +42,6 @@
 
 (require 'ring)
 
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  r))))
-
 ;; end pacifier
 
 (require 'viper-init)
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 1e37276a242..889404ef098 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -562,7 +562,6 @@ This does NOT start the retrieval timers."
         (newsticker--debug-msg "Getting news for %s" (symbol-name feed))
         (newsticker-get-news (symbol-name feed)))))
 
-(unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 (declare-function w3m-toggle-inline-image "ext:w3m" (&optional force no-cache))
 
 (defun newsticker-w3m-show-inline-images ()
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index b2997d71b19..59a57293ee8 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -259,7 +259,6 @@ their id stays constant."
 
 ;; ======================================================================
 
-(unless (fboundp 'declare-function) (defmacro declare-function (&rest _)))
 (declare-function w3m-toggle-inline-images "ext:w3m" (&optional force no-cache))
 (defvar w3m-fill-column)
 (defvar w3-maximum-line-length)
diff --git a/lisp/ps-def.el b/lisp/ps-def.el
index f34473bbb6e..d0cd7625a41 100644
--- a/lisp/ps-def.el
+++ b/lisp/ps-def.el
@@ -31,9 +31,6 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest _r))))
-
 (declare-function ps-plot-with-face "ps-print" (from to face))
 (declare-function ps-plot-string    "ps-print" (string))
 
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 1158b7146e2..104a5782682 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -39,9 +39,6 @@
 
 (defvar ediff-after-quit-hook-internal nil)
 
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  _r))))
-
 ;; end pacifier
 
 
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 67e9bf2d9de..0535aa67253 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -38,10 +38,6 @@
 (defvar frame-icon-title-format)
 (defvar ediff-diff-status)
 
-;; declare-function does not exist in XEmacs
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  _r))))
-
 (require 'ediff-init)
 (require 'ediff-help)
 ;; end pacifier
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index a5e8022f1c8..32a6820fe7d 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -112,10 +112,6 @@
 
 (provide 'ediff)
 
-;; Compiler pacifier
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest  _r))))
-
 (require 'ediff-util)
 ;; end pacifier