[Emacs-diffs] trunk r117905: Fix bug#18265

[Dmitry Gutov]

------------------------------------------------------------
revno: 117905
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18265
committer: Dmitry Gutov <address@hidden>
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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp.el        lisp.el-20091113204419-o5vbwnq5f7feedwu-131

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-19 03:28:31 +0000
+++ b/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  <address@hidden>
 

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2014-09-19 03:28:31 +0000
+++ b/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