Skip to content

Commit ac74e20

Browse files
arichiardibbatsov
authored andcommitted
Kill inf-clojure-var-at-point
Now every function calls the more reliable inf-clojure-symbol-at-point.
1 parent d81e266 commit ac74e20

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

inf-clojure.el

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -698,17 +698,6 @@ The value is nil if it can't find one."
698698
(and (symbolp obj) obj))))
699699
(error nil)))
700700

701-
702-
;;; Adapted from variable-at-point in help.el.
703-
(defun inf-clojure-var-at-pt ()
704-
(condition-case ()
705-
(save-excursion
706-
(forward-sexp -1)
707-
(skip-chars-forward "'")
708-
(let ((obj (read (current-buffer))))
709-
(and (symbolp obj) obj)))
710-
(error nil)))
711-
712701
(defun inf-clojure-symbol-at-point ()
713702
"Return the name of the symbol at point, otherwise nil."
714703
(or (thing-at-point 'symbol) ""))
@@ -722,8 +711,8 @@ See function `inf-clojure-var-doc-form'. When invoked with a
722711
prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol name."
723712
(interactive "P")
724713
(let ((var (if prompt-for-symbol
725-
(car (inf-clojure-symprompt "Var doc" (inf-clojure-var-at-pt)))
726-
(inf-clojure-var-at-pt))))
714+
(car (inf-clojure-symprompt "Var doc" (inf-clojure-symbol-at-point)))
715+
(inf-clojure-symbol-at-point))))
727716
(comint-proc-query (inf-clojure-proc) (format (inf-clojure-var-doc-form) var))))
728717

729718
(defun inf-clojure-show-var-source (prompt-for-symbol)
@@ -732,8 +721,8 @@ See variable `inf-clojure-var-source-form'. When invoked with a
732721
prefix argument PROMPT-FOR-SYMBOL, it prompts for a symbol name."
733722
(interactive "P")
734723
(let ((var (if prompt-for-symbol
735-
(car (inf-clojure-symprompt "Var source" (inf-clojure-var-at-pt)))
736-
(inf-clojure-var-at-pt))))
724+
(car (inf-clojure-symprompt "Var source" (inf-clojure-symbol-at-point)))
725+
(inf-clojure-symbol-at-point))))
737726
(comint-proc-query (inf-clojure-proc) (format inf-clojure-var-source-form var))))
738727

739728
(defun inf-clojure-arglist (fn)
@@ -791,7 +780,7 @@ PROMPT-FOR-NS, it prompts for a namespace name."
791780
(defun inf-clojure-apropos (var)
792781
"Send a form to the inferior Clojure to give apropos for VAR.
793782
See variable `inf-clojure-apropos-form'."
794-
(interactive (inf-clojure-symprompt "Var apropos" (inf-clojure-var-at-pt)))
783+
(interactive (inf-clojure-symprompt "Var apropos" (inf-clojure-symbol-at-point)))
795784
(comint-proc-query (inf-clojure-proc) (format inf-clojure-apropos-form var)))
796785

797786
(defun inf-clojure-macroexpand (&optional macro-1)

0 commit comments

Comments
 (0)