[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117574: Fix import completion.
From: |
Fabián Ezequiel Gallina |
Subject: |
[Emacs-diffs] emacs-24 r117574: Fix import completion. |
Date: |
Sun, 12 Oct 2014 15:12:20 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117574
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18582
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-10-12 12:12:04 -0300
message:
Fix import completion.
* lisp/progmodes/python.el (python-shell-completion-get-completions):
Fix import case regexp.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/python.el python.el-20091113204419-o5vbwnq5f7feedwu-3008
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-10 04:03:27 +0000
+++ b/lisp/ChangeLog 2014-10-12 15:12:04 +0000
@@ -1,3 +1,9 @@
+2014-10-12 Fabián Ezequiel Gallina <address@hidden>
+
+ Fix import completion. (Bug#18582)
+ * progmodes/python.el (python-shell-completion-get-completions):
+ Fix import case regexp.
+
2014-10-10 Stefan Monnier <address@hidden>
* progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2014-10-01 00:41:51 +0000
+++ b/lisp/progmodes/python.el 2014-10-12 15:12:04 +0000
@@ -2695,10 +2695,7 @@
(save-excursion
(buffer-substring-no-properties
(line-beginning-position) ;End of prompt.
- (progn
- (re-search-backward "^")
- (python-util-forward-comment) ;FIXME: Why?
- (point)))))
+ (re-search-backward "^"))))
(completion-code
;; Check whether a prompt matches a pdb string, an import
;; statement or just the standard prompt and use the
@@ -2713,7 +2710,7 @@
(t nil)))
(input
(if (string-match
- (python-rx (+ space) (or "from" "import") space)
+ (python-rx line-start (* space) (or "from" "import") space)
line)
line
input)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117574: Fix import completion.,
Fabián Ezequiel Gallina <=