diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/progmodes/python.el | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.bz2 emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
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 8ff7a300d48..530eb2fb95e 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -422,7 +422,7 @@ (string-delimiter . ,(rx (and ;; Match even number of backslashes. (or (not (any ?\\ ?\' ?\")) point - ;; Quotes might be preceded by a escaped quote. + ;; Quotes might be preceded by an escaped quote. (and (or (not (any ?\\)) point) ?\\ (* ?\\ ?\\) (any ?\' ?\"))) (* ?\\ ?\\) @@ -925,7 +925,7 @@ keyword (back-to-indentation) (python-syntax-closing-paren-p)) (cons :inside-paren-at-closing-nested-paren start)) - ;; This line starts from a opening block in its own line. + ;; This line starts from an opening block in its own line. ((save-excursion (goto-char start) (when (and @@ -1641,7 +1641,7 @@ ARG move forward only one sexp, else move backwards." (defun python-nav--lisp-forward-sexp-safe (&optional arg) "Safe version of standard `forward-sexp'. -When at end of sexp (i.e. looking at a opening/closing paren) +When at end of sexp (i.e. looking at an opening/closing paren) skips it instead of throwing an error. With positive ARG move forward only one sexp, else move backwards." (let* ((arg (if (or (not arg) (> arg 0)) 1 -1)) |