* Proposed patches
@ 2004-02-24 23:00 Miles Bader
2004-02-25 5:37 ` Eli Zaretskii
2004-02-25 12:09 ` Kim F. Storm
0 siblings, 2 replies; 8+ messages in thread
From: Miles Bader @ 2004-02-24 23:00 UTC (permalink / raw)
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
Hi,
The following patches are from my emacs tiling branch, and fix a number
of annoying crash bugs, but also seem to apply equally well to CVS HEAD
(however, at least in the case of the third patch, I couldn't actually
reproduce the crash using CVS HEAD).
Do these changes look alright to people? [If I don't hear any
complaints, I'll apply them to CVS]
Thanks,
-Miles
patch-1:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch-1 --]
[-- Type: text/x-patch, Size: 639 bytes --]
2004-02-10 Miles Bader <miles@gnu.org>
* xfns.c (lookup_image): Remove xassert(!interrupt_input_blocked);
BLOCK_INPUT can be nested, so it doesn't make much sense.
--- orig/src/xfns.c
+++ mod/src/xfns.c
@@ -1,5 +1,5 @@
/* Functions for the X window system.
- Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
+ Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
Free Software Foundation.
This file is part of GNU Emacs.
@@ -5414,7 +5414,6 @@
}
UNBLOCK_INPUT;
- xassert (!interrupt_input_blocked);
}
/* We're using IMG, so set its timestamp to `now'. */
[-- Attachment #3: Type: text/plain, Size: 12 bytes --]
patch-2:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: patch-2 --]
[-- Type: text/x-patch, Size: 699 bytes --]
2004-02-11 Miles Bader <miles@gnu.org>
* xdisp.c (produce_image_glyph): Force negative descents to zero.
--- orig/src/xdisp.c
+++ mod/src/xdisp.c
@@ -17827,6 +17827,11 @@
it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent;
it->pixel_width = img->width + 2 * img->hmargin;
+ /* It's quite possible for images to have an ascent greater than
+ their height, so don't get confused in that case. */
+ if (it->descent < 0)
+ it->descent = 0;
+
/* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent. */
face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
if (face_ascent > it->ascent)
[-- Attachment #5: Type: text/plain, Size: 12 bytes --]
patch-3:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: patch-3 --]
[-- Type: text/x-patch, Size: 1088 bytes --]
2004-02-25 Miles Bader <miles@gnu.org>
* xdisp.c (check_it): Check string/string_pos consistency.
(init_iterator): Initialize string-related fields properly.
--- orig/src/xdisp.c
+++ mod/src/xdisp.c
@@ -1905,10 +1905,14 @@
xassert (STRINGP (it->string));
xassert (IT_STRING_CHARPOS (*it) >= 0);
}
- else if (it->method == next_element_from_buffer)
+ else
{
- /* Check that character and byte positions agree. */
- xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
+ xassert (IT_STRING_CHARPOS (*it) < 0);
+ if (it->method == next_element_from_buffer)
+ {
+ /* Check that character and byte positions agree. */
+ xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
+ }
}
if (it->dpvec)
@@ -2021,6 +2025,8 @@
it->current.overlay_string_index = -1;
it->current.dpvec_index = -1;
it->base_face_id = base_face_id;
+ it->string = Qnil;
+ IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1;
/* The window in which we iterate over current_buffer: */
XSETWINDOW (it->window, w);
[-- Attachment #7: Type: text/plain, Size: 27 bytes --]
--
Run away! Run away!
[-- Attachment #8: Type: text/plain, Size: 141 bytes --]
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-24 23:00 Proposed patches Miles Bader
@ 2004-02-25 5:37 ` Eli Zaretskii
2004-02-25 6:39 ` Alexander Winston
2004-02-25 14:18 ` Stefan Monnier
2004-02-25 12:09 ` Kim F. Storm
1 sibling, 2 replies; 8+ messages in thread
From: Eli Zaretskii @ 2004-02-25 5:37 UTC (permalink / raw)
Cc: emacs-devel
> From: Miles Bader <miles@gnu.org>
> Date: 25 Feb 2004 08:00:28 +0900
>
> --- orig/src/xfns.c
> +++ mod/src/xfns.c
> @@ -1,5 +1,5 @@
> /* Functions for the X window system.
> - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
> + Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
I'm not sure we are allowed to abbreviate the years like that.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-25 5:37 ` Eli Zaretskii
@ 2004-02-25 6:39 ` Alexander Winston
2004-02-25 6:50 ` Miles Bader
2004-02-25 10:06 ` Eli Zaretskii
2004-02-25 14:18 ` Stefan Monnier
1 sibling, 2 replies; 8+ messages in thread
From: Alexander Winston @ 2004-02-25 6:39 UTC (permalink / raw)
Cc: emacs-devel, Miles Bader
[-- Attachment #1.1: Type: text/plain, Size: 517 bytes --]
On Wed, 2004-02-25 at 07:37 +0200, Eli Zaretskii wrote:
> > From: Miles Bader <miles@gnu.org>
> > Date: 25 Feb 2004 08:00:28 +0900
> >
> > --- orig/src/xfns.c
> > +++ mod/src/xfns.c
> > @@ -1,5 +1,5 @@
> > /* Functions for the X window system.
> > - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
> > + Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
>
> I'm not sure we are allowed to abbreviate the years like that.
Why not use "1989, 1992--2004"?
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
[-- Attachment #2: Type: text/plain, Size: 141 bytes --]
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-25 6:39 ` Alexander Winston
@ 2004-02-25 6:50 ` Miles Bader
2004-02-25 10:06 ` Eli Zaretskii
1 sibling, 0 replies; 8+ messages in thread
From: Miles Bader @ 2004-02-25 6:50 UTC (permalink / raw)
Cc: Eli Zaretskii, emacs-devel
Alexander Winston <alexander.winston@comcast.net> writes:
> > > - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
> > > + Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
> >
> > I'm not sure we are allowed to abbreviate the years like that.
>
> Why not use "1989, 1992--2004"?
My recollection is that Richard posted on this list that 2-digit
abbreviations like the above were `OK', but year ranges were not
(according to the FSF's lawyer).
It seems doubtful that a space after the comma or not makes any difference.
-Miles
--
`...the Soviet Union was sliding in to an economic collapse so comprehensive
that in the end its factories produced not goods but bads: finished products
less valuable than the raw materials they were made from.' [The Economist]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-25 6:39 ` Alexander Winston
2004-02-25 6:50 ` Miles Bader
@ 2004-02-25 10:06 ` Eli Zaretskii
1 sibling, 0 replies; 8+ messages in thread
From: Eli Zaretskii @ 2004-02-25 10:06 UTC (permalink / raw)
Cc: emacs-devel, miles
> From: Alexander Winston <alexander.winston@comcast.net>
> Date: Wed, 25 Feb 2004 01:39:26 -0500
>
> Why not use "1989, 1992--2004"?
As Miles says, this is certainly not allowed.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-25 5:37 ` Eli Zaretskii
2004-02-25 6:39 ` Alexander Winston
@ 2004-02-25 14:18 ` Stefan Monnier
2004-02-25 14:29 ` David Kastrup
1 sibling, 1 reply; 8+ messages in thread
From: Stefan Monnier @ 2004-02-25 14:18 UTC (permalink / raw)
Cc: emacs-devel, Miles Bader
>> - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
>> + Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
> I'm not sure we are allowed to abbreviate the years like that.
Yes, we are.
Stefan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-25 14:18 ` Stefan Monnier
@ 2004-02-25 14:29 ` David Kastrup
0 siblings, 0 replies; 8+ messages in thread
From: David Kastrup @ 2004-02-25 14:29 UTC (permalink / raw)
Cc: Eli Zaretskii, Miles Bader, emacs-devel
Stefan Monnier <monnier@iro.umontreal.ca> writes:
> >> - Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
> >> + Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
>
> > I'm not sure we are allowed to abbreviate the years like that.
>
> Yes, we are.
But I'd start a new line rather than compressing blanks.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Proposed patches
2004-02-24 23:00 Proposed patches Miles Bader
2004-02-25 5:37 ` Eli Zaretskii
@ 2004-02-25 12:09 ` Kim F. Storm
1 sibling, 0 replies; 8+ messages in thread
From: Kim F. Storm @ 2004-02-25 12:09 UTC (permalink / raw)
Cc: emacs-devel
Miles Bader <miles@gnu.org> writes:
> Do these changes look alright to people? [If I don't hear any
> complaints, I'll apply them to CVS]
>
They look fine to me (modulo the copyright issue).
--
Kim F. Storm <storm@cua.dk> http://www.cua.dk
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2004-02-25 14:29 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-24 23:00 Proposed patches Miles Bader
2004-02-25 5:37 ` Eli Zaretskii
2004-02-25 6:39 ` Alexander Winston
2004-02-25 6:50 ` Miles Bader
2004-02-25 10:06 ` Eli Zaretskii
2004-02-25 14:18 ` Stefan Monnier
2004-02-25 14:29 ` David Kastrup
2004-02-25 12:09 ` Kim F. Storm
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).