[Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Richard Stallman]

Would someone please work on this?

------- Start of forwarded message -------
To: emacs-pretest-bug@gnu.org
From: Toby Allsopp <Toby.Allsopp@navman.com>
Date: Tue, 28 Nov 2006 11:48:39 +1300
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: emacs-snapshot@packages.debian.org
Subject: auto-fill in c-mode messes up incomplete comments
X-Spam-Status: No, score=0.1 required=5.0 tests=FORGED_RCVD_HELO 
	autolearn=failed version=3.0.4

>From a shell prompt:

emacs -q /tmp/tmp.c
M-x auto-fill-mode
/*
* 

(That's / * <return> * SPC).

When typing the final space, the second line gets deleted.  Pressing
return instead messes it up differently.  This seems to be a problem
with c-mask-paragraph.

After space:
- --8<---------------cut here---------------start------------->8---
/*
- --8<---------------cut here---------------end--------------->8---


After return:
- --8<---------------cut here---------------start------------->8---
/
**
- --8<---------------cut here---------------end--------------->8---


In GNU Emacs 22.0.91.1 (i486-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2006-11-24 on pacem, modified by Debian
 (Debian emacs-snapshot package, version 1:20061123-1)
X server distributor `The X.Org Foundation', version 11.0.70101000
configured using `configure  '--build' 'i486-linux-gnu' '--host' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs-snapshot:/etc/emacs:/usr/local/share/emacs/22.0.91/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/22.0.91/site-lisp:/usr/share/emacs/site-lisp:/usr/share/emacs/22.0.91/leim' '--with-x=yes' '--with-x-toolkit=athena' '--with-toolkit-scroll-bars' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g -O2''

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: en_NZ.UTF-8
  locale-coding-system: utf-8
  default-enable-multibyte-characters: t

Major mode: C/l

Minor modes in effect:
  tooltip-mode: t
  tool-bar-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  auto-compression-mode: t
  line-number-mode: t
  abbrev-mode: t

Recent input:
M-x a u t o - f i l l - m o d e <return> / * <return> 
* SPC M-x r e p o <tab> r <tab> <return>

Recent messages:
Loading /etc/emacs/site-start.d/60hyperspec.el (source)...done
Loading /etc/emacs/site-start.d/65bitmap-mule.el (source)...done
Loading /etc/emacs/site-start.d/70x-face-el.el (source)...done
For information about the GNU Project and its goals, type C-h C-p.
tmp.c has auto save data; consider M-x recover-this-file
Loading cc-mode...done
Loading tabify...done
c-mask-paragraph: Beginning of buffer
Making completion list...
Loading emacsbug...done


_______________________________________________
emacs-pretest-bug mailing list
emacs-pretest-bug@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug
------- End of forwarded message -------

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Michaël Cadilhac]

[-- Attachment #1.1.1: Type: text/plain, Size: 611 bytes --]

Richard Stallman <rms@gnu.org> writes:

> From: Toby Allsopp <Toby.Allsopp@navman.com>
> Subject: auto-fill in c-mode messes up incomplete comments
> To: emacs-pretest-bug@gnu.org
> Cc: emacs-snapshot@packages.debian.org
> Date: Tue, 28 Nov 2006 11:48:39 +1300
>
>>From a shell prompt:
>
> emacs -q /tmp/tmp.c
> M-x auto-fill-mode
> /*
> * 
>
> (That's / * <return> * SPC).
>
> When typing the final space, the second line gets deleted.  Pressing
> return instead messes it up differently.  This seems to be a problem
> with c-mask-paragraph.

Toby, does the following fix your problem?


[-- Attachment #1.1.2: cc-cmds.patch --]
[-- Type: text/x-patch, Size: 1851 bytes --]

Index: lisp/progmodes/cc-cmds.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cc-cmds.el,v
retrieving revision 1.46
diff -c -r1.46 cc-cmds.el
*** lisp/progmodes/cc-cmds.el	3 Dec 2006 00:56:56 -0000	1.46
--- lisp/progmodes/cc-cmds.el	25 Dec 2006 11:23:00 -0000
***************
*** 3707,3715 ****
  
  		  (save-excursion
  		    (goto-char (cdr c-lit-limits))
- 		    (setq tmp-post (point-marker))
- 		    (insert ?\n)
- 		    (set-marker end (point))
  		    (forward-line -1)	; last line of the comment
  		    (if (and (looking-at (concat "[ \t]*\\(\\("
  						 c-current-comment-prefix
--- 3707,3712 ----
***************
*** 3750,3756 ****
  			  (setq point-rel
  				(and (>= point-rel 0)
  				     (- (point) (min point-rel spaces)))))
! 		      (setq point-rel nil)))
  
  		  (if point-rel
  		      ;; Point was in the middle of the string we
--- 3747,3757 ----
  			  (setq point-rel
  				(and (>= point-rel 0)
  				     (- (point) (min point-rel spaces)))))
! 		      (setq point-rel nil))
! 		    (goto-char (cdr c-lit-limits))
! 		    (setq tmp-post (point-marker))
! 		    (insert ?\n)
! 		    (set-marker end (point)))
  
  		  (if point-rel
  		      ;; Point was in the middle of the string we
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10483
diff -C0 -r1.10483 ChangeLog
*** lisp/ChangeLog	25 Dec 2006 00:22:49 -0000	1.10483
--- lisp/ChangeLog	25 Dec 2006 11:24:23 -0000
***************
*** 0 ****
--- 1,5 ----
+ 2006-12-25  Michaël Cadilhac  <michael.cadilhac@lrde.org>
+ 
+ 	* progmodes/cc-cmds.el (c-mask-paragraph): Append the `\n' only after
+ 	the `hang-ender-stuck' treatment.
+ 

[-- Attachment #1.1.3: Type: text/plain, Size: 412 bytes --]


Thanks.
-- 
/!\ My mail address has changed, please update your files accordingly.
 |      Michaël `Micha' Cadilhac     |  Pour les 35-40 ans, l'humour          |
 |         Epita/LRDE Promo 2007     |       c'est une plus-value.            |
 |  http://michael.cadilhac.name     |          -- Guillaume L.               |
 `--JID: michael.cadilhac@gmail.com--'                                   -  --'

[-- Attachment #1.2: Type: application/pgp-signature, Size: 188 bytes --]

[-- Attachment #2: Type: text/plain, Size: 347 bytes --]

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Toby Allsopp]

The following message is a courtesy copy of an article
that has been posted to gmane.emacs.cc-mode.general,gmane.emacs.devel as well.

michael@cadilhac.name (Michaël Cadilhac) writes:

> Richard Stallman <rms@gnu.org> writes:
>
>> From: Toby Allsopp <Toby.Allsopp@navman.com>
>> Subject: auto-fill in c-mode messes up incomplete comments
>> To: emacs-pretest-bug@gnu.org
>> Cc: emacs-snapshot@packages.debian.org
>> Date: Tue, 28 Nov 2006 11:48:39 +1300
>>
>>>From a shell prompt:
>>
>> emacs -q /tmp/tmp.c
>> M-x auto-fill-mode
>> /*
>> * 
>>
>> (That's / * <return> * SPC).
>>
>> When typing the final space, the second line gets deleted.  Pressing
>> return instead messes it up differently.  This seems to be a problem
>> with c-mask-paragraph.
>
> Toby, does the following fix your problem?

It fixes it for the SPC case, but not for the RET case (/ * <return> *
<return>).

Toby (at home).

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Richard Stallman]

Please install your change, and then I'd like people to try the
latest code for editing C files to see if this introduces any new bug.


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Michaël Cadilhac]

[-- Attachment #1.1: Type: text/plain, Size: 1888 bytes --]

Richard Stallman <rms@gnu.org> writes:

> Please install your change, and then I'd like people to try the
> latest code for editing C files to see if this introduces any new bug.

As Toby pointed out, this patch only cures part of the problem.
I think the way `hang-ender-stuck' is processed has to be read by some
knowledgeable people, and patched once and for all.

I'll try to see if I can find a fix. ATM, I can fix Toby's problem but
I still have weird behaviors:

*** cc-cmds.el	03 Dec 2006 01:56:56 +0100	1.46
--- cc-cmds.el	26 Dec 2006 11:32:25 +0100	
***************
*** 3733,3739 ****
  			  ;; text and the ender, depending on how
  			  ;; many there are now.
  			  (unless spaces
! 			    (setq spaces (- ender-column (current-column))))
  			  (setq auto-fill-spaces (c-delete-and-extract-region
  						  (point) ender-start))
  			  ;; paragraph filling condenses multiple spaces to
--- 3730,3736 ----
  			  ;; text and the ender, depending on how
  			  ;; many there are now.
  			  (unless spaces
! 			    (setq spaces (max 1 (- ender-column (current-column)))))e
  			  (setq auto-fill-spaces (c-delete-and-extract-region
  						  (point) ender-start))
  			  ;; paragraph filling condenses multiple spaces to

Still leads to weird things, for example:
Buffer---------
/*
 *
 *
---------------
Point on second line, then hit `space', you're on the third line. This
is already the case with the current code, but in another fashion.
Well. There's hope, I think.

Merry Juanma's-birthday-mas.

-- 
 |      Michaël `Micha' Cadilhac     |  La culture c'est comme la confiture,  |
 |         Epita/LRDE Promo 2007     |      c'est meilleur avec du pain.      |
 |  http://michael.cadilhac.name     |           -- MOI59                     |
 `--JID: michael.cadilhac@gmail.com--'                                   -  --'

[-- Attachment #1.2: Type: application/pgp-signature, Size: 188 bytes --]

[-- Attachment #2: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Richard Stallman]

    I'll try to see if I can find a fix. ATM, I can fix Toby's problem but
    I still have weird behaviors:

Are they NEW weird behaviors, or did they already happen?
If they are not new, please install your additional patch.

    I think the way `hang-ender-stuck' is processed has to be read by some
    knowledgeable people, and patched once and for all.

Maybe you are right, but we may not have anyone else available now.
Alan seems to be very busy these days, and I don't know if we can
count on him to have time for this soon.

So whatever you can do to fix SOME of the bugs, without adding new
ones, will be much appreciated.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Alan Mackenzie]

Hi, Richard, Michaël!

On Tue, Dec 26, 2006 at 09:59:38PM -0500, Richard Stallman wrote:
>     I'll try to see if I can find a fix. ATM, I can fix Toby's problem but
>     I still have weird behaviors:

> Are they NEW weird behaviors, or did they already happen?
> If they are not new, please install your additional patch.

>     I think the way `hang-ender-stuck' is processed has to be read by some
>     knowledgeable people, and patched once and for all.

> Maybe you are right, but we may not have anyone else available now.
> Alan seems to be very busy these days, and I don't know if we can
> count on him to have time for this soon.

Apologies: Now that I've committed a wodge of CC Mode bug fixes, I'm
hoping to much less "busy" from now on.

I've just fixed a bug very similar to this, in which a comment ending in
"=======*/" got rubbed out.

The problem with the current bug (in the latest cc-engine.el) is that
c-mask-paragraph assumes that a c-style comment is terminated (with
"*/"), doing this at one point:

(search-forward-regexp (concat "\\=[ \t]*\\("
 		        c-current-comment-prefix "\\)")
		       (- (cdr c-lit-limits) 2) t)
		        ^^^^^^^^^^^^^^^^^^^^^^^^^^

Clearly this is nonsense if the comment hasn't been terminated yet.

I'll fix this (hopefully) tomorrow.
 
Happy 2007!
 
-- 
Alan.

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Giorgos Keramidas]

On Tue, 26 Dec 2006 11:47:26 +0100, michael@cadilhac.name (Michaël Cadilhac) wrote:
> I'll try to see if I can find a fix. ATM, I can fix Toby's problem but
> I still have weird behaviors:
>
> *** cc-cmds.el	03 Dec 2006 01:56:56 +0100	1.46
> --- cc-cmds.el	26 Dec 2006 11:32:25 +0100	
> ***************
> *** 3733,3739 ****
>   			  ;; text and the ender, depending on how
>   			  ;; many there are now.
>   			  (unless spaces
> ! 			    (setq spaces (- ender-column (current-column))))
>   			  (setq auto-fill-spaces (c-delete-and-extract-region
>   						  (point) ender-start))
>   			  ;; paragraph filling condenses multiple spaces to
> --- 3730,3736 ----
>   			  ;; text and the ender, depending on how
>   			  ;; many there are now.
>   			  (unless spaces
> ! 			    (setq spaces (max 1 (- ender-column (current-column)))))e
>   			  (setq auto-fill-spaces (c-delete-and-extract-region
>   						  (point) ender-start))
>   			  ;; paragraph filling condenses multiple spaces to

Hi Michael and everyone,

If someone installs this, then please watch out for the trailing `e'
character in the newly added line.

- Giorgos


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Alan Mackenzie]

Hi, Toby, Hi Richard!

On Sun, Dec 24, 2006 at 07:43:02PM -0500, Richard Stallman wrote:
> Would someone please work on this?

I've just submitted a fix in cc-cmds.el.

Toby, would you please update your cc-cmds.el, and see if my fix actually
is a fix.  Thanks in Advance!

> ------- Start of forwarded message -------
> To: emacs-pretest-bug@gnu.org
> From: Toby Allsopp <Toby.Allsopp@navman.com>
> Date: Tue, 28 Nov 2006 11:48:39 +1300
> MIME-Version: 1.0
> Content-Type: text/plain; charset=us-ascii
> Cc: emacs-snapshot@packages.debian.org
> Subject: auto-fill in c-mode messes up incomplete comments
> X-Spam-Status: No, score=0.1 required=5.0 tests=FORGED_RCVD_HELO 
> 	autolearn=failed version=3.0.4

> >>>From a shell prompt:

> emacs -q /tmp/tmp.c
> M-x auto-fill-mode
> /*
> * 

> (That's / * <return> * SPC).

> When typing the final space, the second line gets deleted.  Pressing
> return instead messes it up differently.  This seems to be a problem
> with c-mask-paragraph.

Absolutely spot on!  I'd subtracted 2 from the position after "*/",
without actually testing that the "*/" was present.  I think I've got it
right, now.

I'm not quite sure what you meant by the following, though.  Can you let
me know whether or not it works now, please.

> After space:
> - --8<---------------cut here---------------start------------->8---
> /*
> - --8<---------------cut here---------------end--------------->8---


> After return:
> - --8<---------------cut here---------------start------------->8---
> /
> **
> - --8<---------------cut here---------------end--------------->8---

-- 
Alan Mackenzie (Ittersbach, Germany)

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Alan Mackenzie]

Hi, Toby, Hi Richard!

On Tue, Jan 02, 2007 at 10:20:55PM +0000, Alan Mackenzie wrote:

> On Sun, Dec 24, 2006 at 07:43:02PM -0500, Richard Stallman wrote:
> > Would someone please work on this?

> I've just submitted a fix in cc-cmds.el.

That fix of mine was buggyi - sorry.  I've just corrected it.  Could you
test this correction, please.  

> Toby, would you please update your cc-cmds.el, and see if my fix actually
> is a fix.  Thanks in Advance!
 
> > ------- Start of forwarded message -------
> > To: emacs-pretest-bug@gnu.org
> > From: Toby Allsopp <Toby.Allsopp@navman.com>
> > Date: Tue, 28 Nov 2006 11:48:39 +1300
> > MIME-Version: 1.0
> > Content-Type: text/plain; charset=us-ascii
> > Cc: emacs-snapshot@packages.debian.org
> > Subject: auto-fill in c-mode messes up incomplete comments
> > X-Spam-Status: No, score=0.1 required=5.0 tests=FORGED_RCVD_HELO 
> > 	autolearn=failed version=3.0.4

> > >>>From a shell prompt:

> > emacs -q /tmp/tmp.c
> > M-x auto-fill-mode
> > /*
> > * 

> > (That's / * <return> * SPC).

> > When typing the final space, the second line gets deleted.  Pressing
> > return instead messes it up differently.  This seems to be a problem
> > with c-mask-paragraph.

> Absolutely spot on!  I'd subtracted 2 from the position after "*/",
> without actually testing that the "*/" was present.  I think I've got it
> right, now.

> I'm not quite sure what you meant by the following, though.  Can you let
> me know whether or not it works now, please.

> > After space:
> > - --8<---------------cut here---------------start------------->8---
> > /*
> > - --8<---------------cut here---------------end--------------->8---


> > After return:
> > - --8<---------------cut here---------------start------------->8---
> > /
> > **
> > - --8<---------------cut here---------------end--------------->8---

-- 
Alan Mackenzie (Ittersbach, Germany).

Re: [Toby.Allsopp@navman.com: auto-fill in c-mode messes up incomplete comments]

[Toby Allsopp]

The following message is a courtesy copy of an article
that has been posted to gmane.emacs.devel as well.

Alan Mackenzie <acm@muc.de> writes:

> Hi, Toby, Hi Richard!
>
> On Tue, Jan 02, 2007 at 10:20:55PM +0000, Alan Mackenzie wrote:
>
>> I've just submitted a fix in cc-cmds.el.
>
> That fix of mine was buggyi - sorry.  I've just corrected it.  Could you
> test this correction, please.

I've tested revision 1.49 of cc-cmds.el and can no longer reproduce
the bug.

Cheers,
Toby.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV