* Inconsistent doc for message-generate-new-buffers
@ 2011-03-07 13:43 Antoine Levitt
2011-03-07 14:42 ` Julien Danjou
0 siblings, 1 reply; 5+ messages in thread
From: Antoine Levitt @ 2011-03-07 13:43 UTC (permalink / raw)
To: ding
The info doc is out of date.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index b286399..2937037 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2298,8 +2298,7 @@ created.
@item unique
@item t
-Create the new buffer with the name generated in the Message way. This
-is the default.
+Create the new buffer with the name generated in the Message way.
@item unsent
Similar to @code{unique} but the buffer name begins with "*unsent ".
@@ -2315,7 +2314,7 @@ type, the To address and the group name (any of these may be
@code{nil}). The function should return the new buffer name.
@end table
-The default value is @code{unique}.
+The default value is @code{unsent}.
@item message-max-buffers
@vindex message-max-buffers
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Inconsistent doc for message-generate-new-buffers
2011-03-07 13:43 Inconsistent doc for message-generate-new-buffers Antoine Levitt
@ 2011-03-07 14:42 ` Julien Danjou
2011-03-07 14:55 ` Antoine Levitt
0 siblings, 1 reply; 5+ messages in thread
From: Julien Danjou @ 2011-03-07 14:42 UTC (permalink / raw)
To: Antoine Levitt; +Cc: ding
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
On Mon, Mar 07 2011, Antoine Levitt wrote:
> The info doc is out of date.
Merged, but please include a ChangeLog entry next time, it'd be easier
to merge. Git format-patch is welcome also. :)
--
Julien Danjou
❱ http://julien.danjou.info
[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Inconsistent doc for message-generate-new-buffers
2011-03-07 14:42 ` Julien Danjou
@ 2011-03-07 14:55 ` Antoine Levitt
2011-03-07 15:09 ` Julien Danjou
2011-03-07 18:52 ` Andreas Schwab
0 siblings, 2 replies; 5+ messages in thread
From: Antoine Levitt @ 2011-03-07 14:55 UTC (permalink / raw)
To: ding
07/03/11 15:42, Julien Danjou
> On Mon, Mar 07 2011, Antoine Levitt wrote:
>
>> The info doc is out of date.
>
> Merged,
Thanks!
> but please include a ChangeLog entry next time, it'd be easier
> to merge.
Ah, right. I saw somebody talk about C-x 4 a and just tried it, it's
awesome. :) I'll do that next time.
> Git format-patch is welcome also. :)
It just seems too much trouble to maintain a separate branch, especially
since I tend to get extremely confused by git error messages and end up
doing a lot of git reset --hard :) So I just maintain a set a patches
without ever committing and I just do git stash && git pull && git stash
apply. It probably doesn't scale too well, but since my changes are
usually small enough not to require commits, that's good enough for me.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Inconsistent doc for message-generate-new-buffers
2011-03-07 14:55 ` Antoine Levitt
@ 2011-03-07 15:09 ` Julien Danjou
2011-03-07 18:52 ` Andreas Schwab
1 sibling, 0 replies; 5+ messages in thread
From: Julien Danjou @ 2011-03-07 15:09 UTC (permalink / raw)
To: Antoine Levitt; +Cc: ding
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
On Mon, Mar 07 2011, Antoine Levitt wrote:
> It just seems too much trouble to maintain a separate branch, especially
> since I tend to get extremely confused by git error messages and end up
> doing a lot of git reset --hard :) So I just maintain a set a patches
> without ever committing and I just do git stash && git pull && git stash
> apply. It probably doesn't scale too well, but since my changes are
> usually small enough not to require commits, that's good enough for me.
You're not forced to create a branch. If you commit into master, just
do:
git format-patch origin/master..
And you'll get your file. Then do reset --hard if you want.
--
Julien Danjou
❱ http://julien.danjou.info
[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Inconsistent doc for message-generate-new-buffers
2011-03-07 14:55 ` Antoine Levitt
2011-03-07 15:09 ` Julien Danjou
@ 2011-03-07 18:52 ` Andreas Schwab
1 sibling, 0 replies; 5+ messages in thread
From: Andreas Schwab @ 2011-03-07 18:52 UTC (permalink / raw)
To: Antoine Levitt; +Cc: ding
Antoine Levitt <antoine.levitt@gmail.com> writes:
> It just seems too much trouble to maintain a separate branch, especially
> since I tend to get extremely confused by git error messages and end up
> doing a lot of git reset --hard :) So I just maintain a set a patches
> without ever committing and I just do git stash && git pull && git stash
> apply.
Try git pull --rebase instead.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-07 18:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-07 13:43 Inconsistent doc for message-generate-new-buffers Antoine Levitt
2011-03-07 14:42 ` Julien Danjou
2011-03-07 14:55 ` Antoine Levitt
2011-03-07 15:09 ` Julien Danjou
2011-03-07 18:52 ` Andreas Schwab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).