------------------------------------------------------------
revno: 117906
committer: Dmitry Gutov <dgutov@yandex.ru>
branch nick: trunk
timestamp: Fri 2014-09-19 21:33:11 +0400
message:
  * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
  `lisp--local-variables-completion-table' in the `lisp--form-quoted-p'
  case.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-09-19 03:41:42 +0000
+++ lisp/ChangeLog	2014-09-19 17:33:11 +0000
@@ -5,6 +5,9 @@
 	(lisp-completion-at-point): Move `end' back if it's after quote.
 	If in comment or string, only complete when after backquote.
 	(Bug#18265)
+	(lisp-completion-at-point): Don't use
+	`lisp--local-variables-completion-table' in the
+	`lisp--form-quoted-p' case.
 
 2014-09-19  Dmitry Gutov  <dgutov@yandex.ru>
 

=== modified file 'lisp/emacs-lisp/lisp.el'
--- lisp/emacs-lisp/lisp.el	2014-09-19 03:41:42 +0000
+++ lisp/emacs-lisp/lisp.el	2014-09-19 17:33:11 +0000
@@ -979,18 +979,13 @@
                            :company-docsig #'lisp--company-doc-string
                            :company-location #'lisp--company-location))
                     ((lisp--form-quoted-p beg)
-                     (list nil (completion-table-merge
-                                ;; FIXME: Is this table useful for this case?
-                                lisp--local-variables-completion-table
-                                (apply-partially #'completion-table-with-predicate
-                                                 obarray
-                                                 ;; Don't include all symbols
-                                                 ;; (bug#16646).
-                                                 (lambda (sym)
-                                                   (or (boundp sym)
-                                                       (fboundp sym)
-                                                       (symbol-plist sym)))
-                                                 'strict))
+                     (list nil obarray
+                           ;; Don't include all symbols
+                           ;; (bug#16646).
+                           :predicate (lambda (sym)
+                                        (or (boundp sym)
+                                            (fboundp sym)
+                                            (symbol-plist sym)))
                            :annotation-function
                            (lambda (str) (if (fboundp (intern-soft str)) " <f>"))
                            :company-doc-buffer #'lisp--company-doc-buffer
------------------------------------------------------------
revno: 117905
fixes bug: http://debbugs.gnu.org/18265
committer: Dmitry Gutov <dgutov@yandex.ru>
branch nick: trunk
timestamp: Fri 2014-09-19 07:41:42 +0400
message:
  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.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-09-19 03:28:31 +0000
+++ lisp/ChangeLog	2014-09-19 03:41:42 +0000
@@ -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  <dgutov@yandex.ru>
 

=== modified file 'lisp/emacs-lisp/lisp.el'
--- lisp/emacs-lisp/lisp.el	2014-09-19 03:28:31 +0000
+++ lisp/emacs-lisp/lisp.el	2014-09-19 03:41:42 +0000
@@ -957,12 +957,14 @@
 		  (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