From 3907574bb864de9a9020af11c30ec0b48588fc13 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 19 Sep 2014 07:41:42 +0400 Subject: [PATCH] Fix bug#18265 * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Only calculate `table-etc' when `end' is non-nil. (lisp-completion-at-point): Move `end' back if it's after quote. If in comment or string, only complete when after backquote. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/lisp.el | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 777322dc82c..997071f2dc8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,9 @@ * emacs-lisp/lisp.el (lisp-completion-at-point): Only calculate `table-etc' when `end' is non-nil. + (lisp-completion-at-point): Move `end' back if it's after quote. + If in comment or string, only complete when after backquote. + (Bug#18265) 2014-09-19 Dmitry Gutov diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 581e9b9504b..a8bad47a90a 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -957,12 +957,14 @@ It can be quoted, or be inside a quoted form." (save-excursion (goto-char beg) (forward-sexp 1) + (skip-chars-backward "'") (when (>= (point) pos) (point))) (scan-error pos)))) ;; t if in function position. (funpos (eq (char-before beg) ?\())) - (when end + (when (and end (or (not (nth 8 (syntax-ppss))) + (eq (char-before beg) ?`))) (let ((table-etc (if (not funpos) ;; FIXME: We could look at the first element of the list and -- 2.39.5