From: Dmitry Antipov <dmantipov@yandex.ru>
To: "Peder O. Klingenberg" <peder@klingenberg.no>
Cc: 17125@debbugs.gnu.org
Subject: bug#17125: Acknowledgement (24.4.50; daemon mode: closing X client frame exits entire emacs)
Date: Tue, 01 Apr 2014 19:08:40 +0400 [thread overview]
Message-ID: <533AD678.7080307@yandex.ru> (raw)
In-Reply-To: <ksha6d9m5b.fsf@netfonds.no>
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
On 04/01/2014 06:09 PM, Peder O. Klingenberg wrote:
> I will do the breakpoint thing, but I'm out of time at the moment. I'll
> get to it either later today or tomorrow.
Don't; please try this patch instead (hopefully it fixes a bug
in font_matching_entity).
Dmitry
[-- Attachment #2: bug17125.patch --]
[-- Type: text/x-patch, Size: 1996 bytes --]
=== modified file 'src/composite.c'
--- src/composite.c 2014-02-13 12:16:42 +0000
+++ src/composite.c 2014-04-01 14:06:38 +0000
@@ -223,7 +223,7 @@
if (INTEGERP (components))
key = Fmake_vector (make_number (1), components);
else if (STRINGP (components) || CONSP (components))
- key = Fvconcat (1, &components);
+ key = vector1 (components);
else if (VECTORP (components))
key = components;
else if (NILP (components))
=== modified file 'src/font.c'
--- src/font.c 2014-03-03 19:58:20 +0000
+++ src/font.c 2014-04-01 14:32:00 +0000
@@ -2701,7 +2701,7 @@
if (prop < FONT_SPEC_MAX)
val = Fcons (entity, val);
}
- return (Fvconcat (1, &val));
+ return vector1 (val);
}
@@ -2756,10 +2756,7 @@
Lisp_Object copy;
val = driver_list->driver->list (f, scratch_font_spec);
- if (NILP (val))
- val = zero_vector;
- else
- val = Fvconcat (1, &val);
+ val = NILP (val) ? zero_vector : vector1 (val);
copy = copy_font_spec (scratch_font_spec);
ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
XSETCDR (cache, Fcons (Fcons (copy, val), XCDR (cache)));
@@ -2815,7 +2812,7 @@
entity = driver_list->driver->match (f, work);
copy = copy_font_spec (work);
ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
- XSETCDR (cache, Fcons (Fcons (copy, entity), XCDR (cache)));
+ XSETCDR (cache, Fcons (Fcons (copy, vector1 (entity)), XCDR (cache)));
}
if (! NILP (entity))
break;
=== modified file 'src/lisp.h'
--- src/lisp.h 2014-03-27 22:52:14 +0000
+++ src/lisp.h 2014-04-01 14:07:02 +0000
@@ -3709,6 +3709,16 @@
return v;
}
+/* Fast path to avoid Fvconcat (1, &obj). */
+
+INLINE Lisp_Object
+vector1 (Lisp_Object obj)
+{
+ Lisp_Object v = make_uninit_vector (1);
+ ASET (v, 0, obj);
+ return v;
+}
+
extern struct Lisp_Vector *allocate_pseudovector (int, int, enum pvec_type);
#define ALLOCATE_PSEUDOVECTOR(typ,field,tag) \
((typ*) \
next prev parent reply other threads:[~2014-04-01 15:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-27 22:47 bug#17125: 24.4.50; daemon mode: closing X client frame exits entire emacs Peder O. Klingenberg
[not found] ` <handler.17125.B.13959614234976.ack@debbugs.gnu.org>
2014-04-01 11:35 ` bug#17125: Acknowledgement (24.4.50; daemon mode: closing X client frame exits entire emacs) Peder O. Klingenberg
2014-04-01 13:47 ` Dmitry Antipov
2014-04-01 14:09 ` Peder O. Klingenberg
2014-04-01 15:08 ` Dmitry Antipov [this message]
2014-04-01 15:27 ` Andreas Schwab
2014-04-01 16:27 ` Dmitry Antipov
2014-04-01 21:02 ` Peder O. Klingenberg
2014-04-01 22:07 ` bug#17125: 24.4.50; daemon mode: closing X client frame exits entire emacs Peder O. Klingenberg
2014-04-02 3:46 ` bug#17125: Acknowledgement (24.4.50; daemon mode: closing X client frame exits entire emacs) Dmitry Antipov
2014-04-02 11:50 ` bug#17125: 24.4.50; daemon mode: closing X client frame exits entire emacs Peder O. Klingenberg
2014-04-02 12:24 ` Dmitry Antipov
2014-04-02 13:01 ` Peder O. Klingenberg
2014-07-11 9:01 ` Alexis
2014-10-02 2:46 ` bug#17125: Issue still present in pretest 24.3.94.1: in daemon mode, closing X client frame exits entire Emacs Alexis
2014-10-02 7:06 ` Dmitry Antipov
2014-10-02 10:29 ` Alexis
2014-10-02 11:37 ` Dmitry Antipov
2014-10-03 0:53 ` Alexis
2014-10-03 3:52 ` Dmitry Antipov
2014-10-03 6:39 ` Alexis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=533AD678.7080307@yandex.ru \
--to=dmantipov@yandex.ru \
--cc=17125@debbugs.gnu.org \
--cc=peder@klingenberg.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).