branch: scratch/el-mock
commit 10c9fac555075e389aeb7b38297c50d93540abfe
Author: Damien Cassou <damien.cas...@gmail.com>
Commit: Damien Cassou <damien.cas...@gmail.com>
ad-safe-fset is obsolete (replaced by fset)
`ad-safe-fset` has been removed from Emacs. Looking at the corresponding
patch, it looks like all references to this function now use `fset`
directly:
http://lists.gnu.org/archive/html/emacs-diffs/2012-11/msg01170.html.
I launched the espuds tests on emacs snapshot with this change to
`el-mock` and all tests passed (except the one talked about in issue
#23).
---
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))))))))
