[nongnu] scratch/el-mock bd129d9a63 08/64: Merge branch 'ad-safe-fset-obsolete'

[Stefan Monnier via]

branch: scratch/el-mock
commit bd129d9a63a0112d7b5731291531e7642b69760c
Merge: e072098b76 10c9fac555
Author: Johan Andersson <johan.rej...@gmail.com>
Commit: Johan Andersson <johan.rej...@gmail.com>

    Merge branch 'ad-safe-fset-obsolete'
---
 el-mock.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/el-mock.el b/el-mock.el
index f4d7896982..2b70c88daa 100644
--- a/el-mock.el
+++ b/el-mock.el
@@ -93,7 +93,7 @@
    (lambda ()
      (when (fboundp funcsym)
        (put funcsym 'mock-original-func (symbol-function funcsym)))
-     (ad-safe-fset funcsym `(lambda (&rest x) ,value)))))
+     (fset funcsym `(lambda (&rest x) ,value)))))
 
 (defun stub/teardown (funcsym)
   (mock-suppress-redefinition-message
@@ -101,7 +101,7 @@
      (let ((func (get funcsym 'mock-original-func)))
        (if (not func)
            (fmakunbound funcsym)
-         (ad-safe-fset funcsym func)
+         (fset funcsym func)
          ;; may be unadviced
          )))))
     
@@ -113,7 +113,7 @@
        (when (fboundp funcsym)
          (put funcsym 'mock-original-func (symbol-function funcsym)))
        (put funcsym 'mock-call-count 0)
-       (ad-safe-fset funcsym
+       (fset funcsym
                      `(lambda (&rest actual-args)
                         (incf (get ',funcsym 'mock-call-count))
                         (add-to-list 'mock-verify-list
@@ -126,7 +126,7 @@
      (let ()
        (when (fboundp funcsym)
          (put funcsym 'mock-original-func (symbol-function funcsym)))
-       (ad-safe-fset funcsym
+       (fset funcsym
                      `(lambda (&rest actual-args)
                         (signal 'mock-error '(called))))))))