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 224ce5802c69aa5b2dd48b5e7defdefb19aa3509..3c66abe3e56c3985b3f5d66fd98664d554620229 100644 (file)
--- 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 e72842232e435f8d21ef4a49bbe5e7534ec0f416..5196ca6ac38c0e9060582e05564aafc454537702 100644 (file)
--- 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 9fd68b7a61fb71ad0ff4b732417a7db1fcb29b1a..2e759bc13beb8ef979b55cde3ef864ab3e6e318e 100644 (file)
--- 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 1e37276a24288ea8143ee37429d09d662befdcb9..889404ef09802b505c807ec5cca8dcfc62f89ccd 100644 (file)
--- 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 b2997d71b199ed914ced1cc0906c932d3bd6ebe6..59a57293ee81232221e12e8cab55a635f0ad053c 100644 (file)
--- 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 f34473bbb6e233eeaf31a495c13b28cf28757e48..d0cd7625a41c484907750937ae6a83e6f245b7bd 100644 (file)
--- 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 1158b7146e2e4538df96ecafbc53fc3d9c0ace3f..104a5782682553b06e311f87edb9207c72b3d1f1 100644 (file)
--- 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 67e9bf2d9de7da0eb7c22289a30e5e025d8561eb..0535aa6725354a5e05871ff872878ac19b210f24 100644 (file)
--- 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 a5e8022f1c8effb97df652d766a54d02e0b7fb0d..32a6820fe7d913dce8fb25f3440a5483b74d0baa 100644 (file)
--- 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