procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(lisp-completion-at-point): Try and handle errors.

Browse source
This commit is contained in:
Stefan Monnier 2010-04-21 13:53:03 -04:00
parent e765bf582c
commit 62c5b459af
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lisp/emacs-lisp/lisp.el
View file

@ -633,10 +633,12 @@ considered."
;; FIXME: the `end' could be after point?
(let* ((pos (point))
(beg (with-syntax-table emacs-lisp-mode-syntax-table
(save-excursion
(backward-sexp 1)
(skip-syntax-forward "'")
(point))))
(condition-case nil
(save-excursion
(backward-sexp 1)
(skip-syntax-forward "'")
(point))
(scan-error pos))))
(predicate
(or predicate
(save-excursion
@ -658,12 +660,14 @@ considered."
'fboundp)))))
(end
(unless (or (eq beg (point-max))
(member (char-syntax (char-after beg)) '(?\( ?\))))
(save-excursion
(goto-char beg)
(forward-sexp 1)
(when (>= (point) pos)
(point))))))
(member (char-syntax (char-after beg)) '(?\" ?\( ?\))))
(condition-case nil
(save-excursion
(goto-char beg)
(forward-sexp 1)
(when (>= (point) pos)
(point)))
(scan-error pos)))))
(when end
(list beg end obarray
:predicate predicate