23.0.60; python.el: auto-indentation doesn't work with continuation lines

23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Torsten Bronger]

When I use a continuation line (either by parenthesis or by backslash) in a
Python program, the following, non-continuated line is erroneous indented.  For
example,

def open_file():
    file_ = open("file.txt",
                 "r")

makes <TAB> jump between column 0 and 17, although 4 would be correct.


In GNU Emacs 23.0.60.2 (x86_64-unknown-linux-gnu)
 of 2008-04-20 on wilson
Windowing system distributor `The Cygwin/X Project', version 11.0.60899901
configured using `configure  '--prefix=/usr/local/' '--mandir=/usr/local/share/man/' '--infodir=/usr/local/share/info/' '--with-x-toolkit=no' '--with-xpm' '--with-jpeg' '--with-tiff' '--with-gif' '--with-png' '--with-x''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: de_DE.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t

Major mode: Emacs-Lisp

Minor modes in effect:
  global-auto-revert-mode: t
  savehist-mode: t
  display-time-mode: t
  desktop-save-mode: t
  mouse-wheel-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-compression-mode: t
  line-number-mode: t

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Edward O'Connor]

Torsten Bronger wrote:

> When I use a continuation line (either by parenthesis or by backslash)
> in a Python program, the following, non-continuated line is erroneous
> indented. For example,
>
> def open_file():
>     file_ = open("file.txt",
>                  "r")
>
> makes <TAB> jump between column 0 and 17, although 4 would be correct.

Actually, that indentation is correct. The arguments in multi-line
function calls should be aligned in such a way.


Ted

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Torsten Bronger]

Hallöchen!

Edward O'Connor writes:

> Torsten Bronger wrote:
>
>> When I use a continuation line (either by parenthesis or by
>> backslash) in a Python program, the following, non-continuated
>> line is erroneous indented. For example,
>>
>> def open_file():
>>     file_ = open("file.txt",
>>                  "r")
>>
>> makes <TAB> jump between column 0 and 17, although 4 would be
>> correct.
>
> Actually, that indentation is correct. The arguments in multi-line
> function calls should be aligned in such a way.

I said, the "following, non-continuated line is erroneous indented":

def open_file():
    file_ = open("file.txt",
                 "r")
    here_to_proceed = True

Tschö,
Torsten.

-- 
Torsten Bronger, aquisgrana, europa vetus
                                      Jabber ID: bronger@jabber.org
               (See http://ime.webhop.org for further contact info.)

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[David Robinow]

On Sat, Apr 26, 2008 at 2:51 PM, Torsten Bronger
<bronger@physik.rwth-aachen.de> wrote:
>  Edward O'Connor writes:
>  > Actually, that indentation is correct. The arguments in multi-line
>  > function calls should be aligned in such a way.
>
>  I said, the "following, non-continuated line is erroneous indented":
>
>  def open_file():
>     file_ = open("file.txt",
>                  "r")
>     here_to_proceed = True
>
To clarify, the last line above is aligned with the continued line
above it, rather than starting at the correct indentation level.
This is with Dave Love's python.el included in emacs.
 python-mode.el, by Tim Peters, Barry Warsaw et al, indents this correctly.

Recently there was some discussion about emacs switching to
python-mode.el (or perhaps trying to merge the two?)
The authors of python-mode.el, if I remember correctly, expressed
willingness to assign copyright.
What is the current status of python-mode.el ?

Is it proper to look at python-mode.el when making changes to python.el?

Is it a waste of time to fix bugs in python.el, since it will soon be replaced?

DR

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Glenn Morris]

"David Robinow" wrote:

> To clarify, the last line above is aligned with the continued line
> above it, rather than starting at the correct indentation level.
> This is with Dave Love's python.el included in emacs.
>  python-mode.el, by Tim Peters, Barry Warsaw et al, indents this correctly.

So does the python.el in Emacs 22, so it ought not to be too hard to fix.

> Recently there was some discussion about emacs switching to
> python-mode.el (or perhaps trying to merge the two?)
> The authors of python-mode.el, if I remember correctly, expressed
> willingness to assign copyright.

See etc/TODO:

  ** Possibly install python-mode in place of python.el, or combine the two.
  Someone needs to do the work of figuring out who all the non-trivial
  python-mode.el contributors are and getting assignments.
  http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02156.html
  http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02201.html
  http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02489.html
  http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html

> Is it proper to look at python-mode.el when making changes to python.el?

IMO no, until the legal issues are fully sorted out. It's my
impression that this may be difficult.

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Stefan Monnier]

>> To clarify, the last line above is aligned with the continued line
>> above it, rather than starting at the correct indentation level.
>> This is with Dave Love's python.el included in emacs.
>> python-mode.el, by Tim Peters, Barry Warsaw et al, indents this correctly.
> So does the python.el in Emacs 22, so it ought not to be too hard to fix.

Could someone take a closer look (including trying it out with Dave
Love's version)?

>> Is it proper to look at python-mode.el when making changes to python.el?
> IMO no, until the legal issues are fully sorted out.

Indeed.


        Stefan

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Glenn Morris]

Stefan Monnier wrote:

> Could someone take a closer look (including trying it out with Dave
> Love's version)?

Syncing this change from DL's version fixes it:

*** python.el	17 Apr 2008 20:09:54 -0000	1.85
--- python.el	28 Apr 2008 19:51:29 -0000
***************
*** 977,985 ****
  multi-line bracketed expressions."
    (beginning-of-line)
    (python-beginning-of-string)
!   (let ((point (point)))
      (while (and (python-continuation-line-p)
! 		(> point (setq point (point))))
        (beginning-of-line)
        (if (python-backslash-continuation-line-p)
  	  (progn
--- 977,987 ----
  multi-line bracketed expressions."
    (beginning-of-line)
    (python-beginning-of-string)
!   (let (point)
      (while (and (python-continuation-line-p)
! 		(if point
! 		    (< (point) point)
! 		  t))
        (beginning-of-line)
        (if (python-backslash-continuation-line-p)
  	  (progn
***************
*** 987,993 ****
  	    (while (python-backslash-continuation-line-p)
  	      (forward-line -1)))
  	(python-beginning-of-string)
! 	(python-skip-out))))
    (back-to-indentation))
  
  (defun python-skip-out (&optional forward syntax)
--- 989,996 ----
  	    (while (python-backslash-continuation-line-p)
  	      (forward-line -1)))
  	(python-beginning-of-string)
! 	(python-skip-out))
!       (setq point (point))))
    (back-to-indentation))
  
  (defun python-skip-out (&optional forward syntax)

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Stefan Monnier]

>> Could someone take a closer look (including trying it out with Dave
>> Love's version)?

> Syncing this change from DL's version fixes it:

What do you mean by "syncing"?  Is it a change in DL's version that we
haven't yet merged, or is it a change that we introduced?


        Stefan

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Glenn Morris]

Stefan Monnier wrote:

> Is it a change in DL's version that we haven't yet merged

Yes.

I can merge this one if you like, but don't want to do a full update.

It looks like your "vendor branch" wasn't updated last time this was
done, so it's not immediately obvious how much needs to be done.

Re: 23.0.60; python.el: auto-indentation doesn't work with continuation lines

[Stefan Monnier]

>> Is it a change in DL's version that we haven't yet merged
> Yes.

> I can merge this one if you like, but don't want to do a full update.

I'm all for a full update.  We should strive to minimize the differences
between the two versions.

> It looks like your "vendor branch" wasn't updated last time this was
> done, so it's not immediately obvious how much needs to be done.

Hmm.. the ChangeLog says:

2008-02-21  Dave Love  <fx@gnu.org>
	* progmodes/python.el: Merge from Dave Love's 2008-01-20 version.
[...]

So it looks like the vendor-branch was not used for that merge.


        Stefan