[Emacs-diffs] master 582f46c: Remove some declare-function stub definitions

[Glenn Morris]

branch: master
commit 582f46cbe2d53a09388e96e1c069524460f7105f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    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.
---
 lisp/emulation/viper-cmd.el  | 2 --
 lisp/emulation/viper-keym.el | 2 --
 lisp/emulation/viper-util.el | 3 ---
 lisp/net/newst-plainview.el  | 1 -
 lisp/net/newst-treeview.el   | 1 -
 lisp/ps-def.el               | 3 ---
 lisp/vc/ediff-util.el        | 3 ---
 lisp/vc/ediff-wind.el        | 4 ----
 lisp/vc/ediff.el             | 4 ----
 9 files changed, 23 deletions(-)

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 224ce58..3c66abe 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 e728422..5196ca6 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 9fd68b7..2e759bc 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 1e37276..889404e 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 b2997d7..59a5729 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 f34473b..d0cd762 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 1158b71..104a578 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 67e9bf2..0535aa6 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 a5e8022..32a6820 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