branch: master
commit ea57986aee56e4996d55a76cccde1b4fe1da9f34
Author: Artur Malabarba <bruce.connor...@gmail.com>
Commit: Artur Malabarba <bruce.connor...@gmail.com>
packages/names: Make names--preceeding-sexp compatible with 24.4 again.
Fixes #14
---
names-dev.el | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/names-dev.el b/names-dev.el
index 0133604..4efc12e 100644
--- a/names-dev.el
+++ b/names-dev.el
@@ -176,7 +176,9 @@ to be edebugged."
;;; eval-last-sexp
(defalias 'names--preceding-sexp-original
- (symbol-function 'elisp--preceding-sexp))
+ (if (fboundp 'elisp--preceding-sexp)
+ (symbol-function 'elisp--preceding-sexp)
+ (symbol-function 'preceding-sexp)))
(defun names--preceding-sexp ()
"Like `elisp--preceding-sexp', but expand namespaces."
@@ -188,19 +190,19 @@ to be edebugged."
"Identical to `eval-last-sexp', except it works for forms inside namespaces.
Argument EVAL-LAST-SEXP-ARG-INTERNAL is the same as `eval-last-sexp'."
(interactive "P")
- (cl-letf (((symbol-function 'elisp--preceding-sexp)
- #'names--preceding-sexp))
+ (cl-letf (((symbol-function 'elisp--preceding-sexp) #'names--preceding-sexp)
+ ((symbol-function 'preceding-sexp) #'names--preceding-sexp))
(eval-last-sexp eval-last-sexp-arg-internal)))
(defun names-eval-print-last-sexp (eval-last-sexp-arg-internal)
"Identical to `eval-print-last-sexp', except it works for forms inside
namespaces.
Argument EVAL-LAST-SEXP-ARG-INTERNAL is the same as `eval-print-last-sexp'."
(interactive "P")
- (cl-letf (((symbol-function 'elisp--preceding-sexp)
- #'names--preceding-sexp))
+ (cl-letf (((symbol-function 'elisp--preceding-sexp) #'names--preceding-sexp)
+ ((symbol-function 'preceding-sexp) #'names--preceding-sexp))
(eval-print-last-sexp eval-last-sexp-arg-internal)))
-;; (pp (symbol-function 'names-eval-defun) (current-buffer))
+;; (pp (symbol-function 'names--preceding-sexp-original) (current-buffer))
;;; Find stuff
