Commit a521c1b7 authored by Guido van Rossum's avatar Guido van Rossum

Barry's 2.18 -- don't indent, only outdent

parent 2ed53547
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
;; 1992-1994 Tim Peters <tim@ksr.com> ;; 1992-1994 Tim Peters <tim@ksr.com>
;; Maintainer: bwarsaw@cnri.reston.va.us ;; Maintainer: bwarsaw@cnri.reston.va.us
;; Created: Feb 1992 ;; Created: Feb 1992
;; Version: 2.16 ;; Version: 2.18
;; Last Modified: 1995/03/15 16:23:59 ;; Last Modified: 1995/03/15 18:23:16
;; Keywords: python editing language major-mode ;; Keywords: python editing language major-mode
;; This software is provided as-is, without express or implied ;; This software is provided as-is, without express or implied
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
;; LCD Archive Entry: ;; LCD Archive Entry:
;; python-mode|Barry A. Warsaw|bwarsaw@cnri.reston.va.us ;; python-mode|Barry A. Warsaw|bwarsaw@cnri.reston.va.us
;; |Major mode for editing Python programs ;; |Major mode for editing Python programs
;; |1995/03/15 16:23:59|2.16| ;; |1995/03/15 18:23:16|2.18|
;;; Code: ;;; Code:
...@@ -436,10 +436,12 @@ argument is provided, that many colons are inserted non-electrically." ...@@ -436,10 +436,12 @@ argument is provided, that many colons are inserted non-electrically."
(py-compute-indentation))) (py-compute-indentation)))
) )
(setq outdent py-indent-offset)) (setq outdent py-indent-offset))
;; electric colon won't re-indent lines that start in column ;; Don't indent, only outdent. This assumes that any lines that
;; zero. you'd have to use TAB for that. TBD: Is there a ;; are already outdented relative to py-compute-indentation were
;; better way to determine this??? ;; put there on purpose. Its highly annoying to have `:' indent
(if (zerop (current-indentation)) nil ;; for you. Use TAB, C-c C-l or C-c C-r to adjust. TBD: Is
;; there a better way to determine this???
(if (< (current-indentation) indent) nil
(goto-char here) (goto-char here)
(beginning-of-line) (beginning-of-line)
(delete-horizontal-space) (delete-horizontal-space)
...@@ -1908,7 +1910,7 @@ local bindings to py-newline-and-indent.")) ...@@ -1908,7 +1910,7 @@ local bindings to py-newline-and-indent."))
(setq zmacs-region-stays t))) (setq zmacs-region-stays t)))
(defconst py-version "2.16" (defconst py-version "2.18"
"`python-mode' version number.") "`python-mode' version number.")
(defconst py-help-address "bwarsaw@cnri.reston.va.us" (defconst py-help-address "bwarsaw@cnri.reston.va.us"
"Address accepting submission of bug reports.") "Address accepting submission of bug reports.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment