diff options
| author | Eli Zaretskii | 2018-02-16 23:38:32 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-02-16 23:38:32 +0200 |
| commit | aaad1e62f3e87873135a465530d6686bed5dc4c3 (patch) | |
| tree | f6b3a3d8dc19672309e530f983be26d4ebd77ddc /lisp/progmodes/python.el | |
| parent | 5906418b5b627245dc79137bbf2b41c59b6ba211 (diff) | |
| parent | 9ab3df197f1ee7f23df30f554209b863369f06ee (diff) | |
| download | emacs-aaad1e62f3e87873135a465530d6686bed5dc4c3.tar.gz emacs-aaad1e62f3e87873135a465530d6686bed5dc4c3.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 5baf6e0f80a..c7bb2d97c84 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -422,7 +422,7 @@ | |||
| 422 | (string-delimiter . ,(rx (and | 422 | (string-delimiter . ,(rx (and |
| 423 | ;; Match even number of backslashes. | 423 | ;; Match even number of backslashes. |
| 424 | (or (not (any ?\\ ?\' ?\")) point | 424 | (or (not (any ?\\ ?\' ?\")) point |
| 425 | ;; Quotes might be preceded by a escaped quote. | 425 | ;; Quotes might be preceded by an escaped quote. |
| 426 | (and (or (not (any ?\\)) point) ?\\ | 426 | (and (or (not (any ?\\)) point) ?\\ |
| 427 | (* ?\\ ?\\) (any ?\' ?\"))) | 427 | (* ?\\ ?\\) (any ?\' ?\"))) |
| 428 | (* ?\\ ?\\) | 428 | (* ?\\ ?\\) |
| @@ -925,7 +925,7 @@ keyword | |||
| 925 | (back-to-indentation) | 925 | (back-to-indentation) |
| 926 | (python-syntax-closing-paren-p)) | 926 | (python-syntax-closing-paren-p)) |
| 927 | (cons :inside-paren-at-closing-nested-paren start)) | 927 | (cons :inside-paren-at-closing-nested-paren start)) |
| 928 | ;; This line starts from a opening block in its own line. | 928 | ;; This line starts from an opening block in its own line. |
| 929 | ((save-excursion | 929 | ((save-excursion |
| 930 | (goto-char start) | 930 | (goto-char start) |
| 931 | (when (and | 931 | (when (and |
| @@ -1640,7 +1640,7 @@ ARG move forward only one sexp, else move backwards." | |||
| 1640 | 1640 | ||
| 1641 | (defun python-nav--lisp-forward-sexp-safe (&optional arg) | 1641 | (defun python-nav--lisp-forward-sexp-safe (&optional arg) |
| 1642 | "Safe version of standard `forward-sexp'. | 1642 | "Safe version of standard `forward-sexp'. |
| 1643 | When at end of sexp (i.e. looking at a opening/closing paren) | 1643 | When at end of sexp (i.e. looking at an opening/closing paren) |
| 1644 | skips it instead of throwing an error. With positive ARG move | 1644 | skips it instead of throwing an error. With positive ARG move |
| 1645 | forward only one sexp, else move backwards." | 1645 | forward only one sexp, else move backwards." |
| 1646 | (let* ((arg (if (or (not arg) (> arg 0)) 1 -1)) | 1646 | (let* ((arg (if (or (not arg) (> arg 0)) 1 -1)) |