aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorStefan Monnier2019-06-26 10:24:59 -0400
committerStefan Monnier2019-06-26 10:24:59 -0400
commit0b4e003766f15225dede9bdba4ead33e493856e2 (patch)
tree99de57fe8feeca540f398acb232b75e9c802418c /lisp/progmodes/python.el
parent699fce296b13d7db386b1cb5cecf2710e5196691 (diff)
downloademacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz
emacs-0b4e003766f15225dede9bdba4ead33e493856e2.zip
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 28d8746ffaf..e1f9a33a691 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -628,8 +628,7 @@ builtins.")
628 ;; OS specific 628 ;; OS specific
629 "VMSError" "WindowsError" 629 "VMSError" "WindowsError"
630 ) 630 )
631 symbol-end) 631 symbol-end) . font-lock-type-face)
632 . font-lock-type-face)
633 ;; assignments 632 ;; assignments
634 ;; support for a = b = c = 5 633 ;; support for a = b = c = 5
635 (,(lambda (limit) 634 (,(lambda (limit)
@@ -679,7 +678,6 @@ Which one will be chosen depends on the value of
679 ((rx (or "\"\"\"" "'''")) 678 ((rx (or "\"\"\"" "'''"))
680 (0 (ignore (python-syntax-stringify)))))) 679 (0 (ignore (python-syntax-stringify))))))
681 680
682;; Always define the alias(es) *before* the variable.
683(define-obsolete-variable-alias 'python--prettify-symbols-alist 681(define-obsolete-variable-alias 'python--prettify-symbols-alist
684 'python-prettify-symbols-alist "26.1") 682 'python-prettify-symbols-alist "26.1")
685 683