diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/find-func.el | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 6e10b596e23..a84a7aca52c 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -352,7 +352,7 @@ That buffer should be current already." (end (progn (skip-syntax-forward "w_") (point))) (sym (intern-soft (buffer-substring-no-properties beg end))) - (file (and sym (symbol-file sym)))) + (file (and sym (symbol-file sym 'defun)))) (when file (goto-char beg) ;; help-xref-button needs to operate on something matched diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 2a58c10f827..a70adb4d423 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -242,7 +242,7 @@ in `load-path'." (let ((library (cond ((eq (car-safe def) 'autoload) (nth 1 def)) - ((symbol-file function))))) + ((symbol-file function 'defun))))) (find-function-search-for-symbol function nil library)))) (defalias 'function-at-point 'function-called-at-point) @@ -347,8 +347,7 @@ The library where VARIABLE is defined is searched for in FILE or `find-function-source-path', if non nil, otherwise in `load-path'." (if (not variable) (error "You didn't specify a variable")) - ;; Fixme: I think `symbol-file' should be fixed instead. -- fx - (let ((library (or file (symbol-file (cons 'defvar variable))))) + (let ((library (or file (symbol-file variable 'defvar)))) (find-function-search-for-symbol variable 'variable library))) ;;;###autoload |