Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/progmodes/python.el: Recognize docstrings.

Browse source 
(python-docstring-at-p, python-font-lock-syntactic-face-function):
New functions.
(python-mode): Use them.
This commit is contained in:
Tom Willemse 2014-12-07 11:24:35 -05:00 committed by Stefan Monnier
parent f3a685812a
commit 9dfa949c0d
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/ChangeLog
View file

@ -1,9 +1,16 @@
2014-12-07 Tom Willemse <tom@ryuslash.org> (tiny change)
* progmodes/python.el: Recognize docstrings.
(python-docstring-at-p, python-font-lock-syntactic-face-function):
New functions.
(python-mode): Use them.
2014-12-06 Ulf Jasper <ulf.jasper@web.de>
* net/newst-treeview.el (newsticker--treeview-list-add-item)
(newsticker--treeview-propertize-tag): Bind tree menu to mouse-3.
(newsticker--treeview-create-groups-menu)
(newsticker--treeview-create-tree-menu): Removed.
(newsticker--treeview-create-tree-menu): Remove.
(newsticker--treeview-tree-open-menu): New.
(newsticker-treeview-tree-click): Pass event to
`newsticker-treeview-tree-do-click'.
@ -20,8 +27,8 @@
2014-12-05 Juri Linkov <juri@linkov.net>
* minibuffer.el (minibuffer-completion-help): Compare
selected-window with minibuffer-window to check whether
* minibuffer.el (minibuffer-completion-help):
Compare selected-window with minibuffer-window to check whether
completions should be displayed near the minibuffer. (Bug#17809)
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00311.html
@ -52,7 +59,6 @@
both in terms of the column to which it moves and the return
value. (Bug#19211)
2014-12-05 Stephen Berman <stephen.berman@gmx.net>
2014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/ediff-init.el (ediff-odd-p): Remove.

22
lisp/progmodes/python.el
View file

@ -459,6 +459,23 @@ The type returned can be `comment', `string' or `paren'."
'python-info-ppss-comment-or-string-p
#'python-syntax-comment-or-string-p "24.3")
(defun python-docstring-at-p (pos)
"Check to see if there is a docstring at POS."
(save-excursion
(goto-char pos)
(if (looking-at-p "'''\\|\"\"\"")
(progn
(python-nav-backward-statement)
(looking-at "\\`\\|class \\|def "))
nil)))
(defun python-font-lock-syntactic-face-function (state)
(if (nth 3 state)
(if (python-docstring-at-p (nth 8 state))
font-lock-doc-face
font-lock-string-face)
font-lock-comment-face))
(defvar python-font-lock-keywords
;; Keywords
`(,(rx symbol-start
@ -4312,7 +4329,10 @@ Arguments START and END narrow the buffer region to work on."
'python-nav-forward-sexp)
(set (make-local-variable 'font-lock-defaults)
'(python-font-lock-keywords nil nil nil nil))
'(python-font-lock-keywords
nil nil nil nil
(font-lock-syntactic-face-function
. python-font-lock-syntactic-face-function)))
(set (make-local-variable 'syntax-propertize-function)
python-syntax-propertize-function)