summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>1996-08-01 18:17:14 (GMT)
committerBarry Warsaw <barry@python.org>1996-08-01 18:17:14 (GMT)
commitce60bc719212f490ba1d3c6f7aaad43b21342638 (patch)
treea640c21029b54235ecb2d44c1e2dc7e3777cfd9c
parent6d9cc808a22f58e8702fe23dd27a2d878e416db7 (diff)
downloadcpython-ce60bc719212f490ba1d3c6f7aaad43b21342638.zip
cpython-ce60bc719212f490ba1d3c6f7aaad43b21342638.tar.gz
cpython-ce60bc719212f490ba1d3c6f7aaad43b21342638.tar.bz2
(py-keep-region-active): Zap duplicate defun.
-rw-r--r--Misc/python-mode.el17
1 files changed, 6 insertions, 11 deletions
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 2811295..7db9f38 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -493,12 +493,14 @@ py-beep-if-tab-change\t\tring the bell if tab-width is changed"
(defun py-keep-region-active ()
- ;; Do whatever is necessary to keep the region active in
- ;; XEmacs 19. This is unnecessary, but no-op in Emacs 19, so just
- ;; ignore byte-compiler warnings you might see.
+ ;; do whatever is necessary to keep the region active in XEmacs.
+ ;; Ignore byte-compiler warnings you might see. Also note that
+ ;; FSF's Emacs 19 does it differently and doesn't its policy doesn't
+ ;; require us to take explicit action.
(and (boundp 'zmacs-region-stays)
(setq zmacs-region-stays t)))
+
;; electric characters
(defun py-outdent-p ()
;; returns non-nil if the current line should outdent one level
@@ -826,7 +828,7 @@ the new line indented."
((py-continuation-line-p)
(let ((startpos (point))
(open-bracket-pos (py-nesting-level))
- endpos searching found)
+ endpos searching found state)
(if open-bracket-pos
(progn
;; align with first item in list; else a normal
@@ -2087,13 +2089,6 @@ local bindings to py-newline-and-indent."))
(set-buffer cbuf))
(sit-for 0))
-(defun py-keep-region-active ()
- ;; do whatever is necessary to keep the region active in XEmacs.
- ;; Ignore byte-compiler warnings you might see. Also note that
- ;; FSF's Emacs 19 does it differently and doesn't its policy doesn't
- ;; require us to take explicit action.
- (and (boundp 'zmacs-region-stays)
- (setq zmacs-region-stays t)))
(defconst py-version "$Revision$"