[COMMIT] Don't override original compiled function documentation with aliases, doc.c
6 years, 7 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1527278921 -3600
# Fri May 25 21:08:41 2018 +0100
# Node ID 86932fba11e0bd9fe72b16d197a0e28fd6d7f54a
# Parent edcd19fab0c4981fbb73c42048f90df3fdfbdc09
Don't override original compiled function documentation with aliases, doc.c
src/ChangeLog addition:
2018-05-25 Aidan Kehoe <kehoea(a)parhasard.net>
* doc.c (Fsnarf_documentation):
If the symbol being examined is an alias for a compiled function,
and that compiled function already has documentation information,
don't override that.
diff -r edcd19fab0c4 -r 86932fba11e0 src/ChangeLog
--- a/src/ChangeLog Fri May 25 13:50:46 2018 +0100
+++ b/src/ChangeLog Fri May 25 21:08:41 2018 +0100
＠＠ -1,3 +1,10 ＠＠
+2018-05-25 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * doc.c (Fsnarf_documentation):
+ If the symbol being examined is an alias for a compiled function,
+ and that compiled function already has documentation information,
+ don't override that.
+
2018-05-19 Aidan Kehoe <kehoea(a)parhasard.net>
Fix some leaks in the GTK code.
diff -r edcd19fab0c4 -r 86932fba11e0 src/doc.c
--- a/src/doc.c Fri May 25 13:50:46 2018 +0100
+++ b/src/doc.c Fri May 25 21:08:41 2018 +0100
＠＠ -930,6 +930,15 ＠＠
not an int (a string, say) leave it alone. */
if (!FIXNUMP (old))
goto weird;
+
+#ifdef COMPILED_FUNCTION_ANNOTATION_HACK
+ if (!EQ (sym, compiled_function_annotation (f)))
+ {
+ /* We don't want to set the information for the
+ alias as the compiled function's details. */
+ goto weird;
+ }
+#endif
}
/* This may be a function or variable where we want
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Give definitions for #'{key-or-mouse,timeout-or-eval,char-or}-event-p.
6 years, 7 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1527252646 -3600
# Fri May 25 13:50:46 2018 +0100
# Node ID edcd19fab0c4981fbb73c42048f90df3fdfbdc09
# Parent 65f388195140fc4a544c42a52b93e30ec9df46ca
Give definitions for #'{key-or-mouse,timeout-or-eval,char-or}-event-p.
lisp/ChangeLog addition:
2018-05-25 Aidan Kehoe <kehoea(a)parhasard.net>
* events.el:
* events.el (key-or-mouse-event-p): New.
* events.el (timeout-or-eval-event-p): New.
* events.el (char-or-event-p): New.
Make these available, the C code has been calling them from
wrong_type_argument() for years, despite their not existing.
diff -r 65f388195140 -r edcd19fab0c4 lisp/ChangeLog
--- a/lisp/ChangeLog Sat May 19 11:21:44 2018 +0100
+++ b/lisp/ChangeLog Fri May 25 13:50:46 2018 +0100
＠＠ -1,3 +1,12 ＠＠
+2018-05-25 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * events.el:
+ * events.el (key-or-mouse-event-p): New.
+ * events.el (timeout-or-eval-event-p): New.
+ * events.el (char-or-event-p): New.
+ Make these available, the C code has been calling them from
+ wrong_type_argument() for years, despite their not existing.
+
2018-04-27 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el:
diff -r 65f388195140 -r edcd19fab0c4 lisp/events.el
--- a/lisp/events.el Sat May 19 11:21:44 2018 +0100
+++ b/lisp/events.el Fri May 25 13:50:46 2018 +0100
＠＠ -102,6 +102,21 ＠＠
normally this means a menu selection or scrollbar action."
(and (event-live-p object) (eq 'misc-user (event-type object))))
+(defun key-or-mouse-event-p (object)
+ "Return t if OBJECT is a key press, a mouse event, or a misc-user event."
+ (and (event-live-p object)
+ (member* (event-type object) '(key-press button-press button-release
+ motion misc-user)) t))
+
+(defun timeout-or-eval-event-p (object)
+ "Return t if OBJECT is a timeout, a misc-user, or an eval event."
+ (and (event-live-p object)
+ (member* (event-type object) '(timeout misc-user eval)) t))
+
+(defun char-or-event-p (object)
+ "Return t if OBJECT is an event, a character, or a `char-int'."
+ (or (eventp object) (char-or-char-int-p object)))
+
;; You could just as easily use event-glyph but we include this for
;; consistency.
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Fix some leaks in the GTK code.
6 years, 7 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1526725304 -3600
# Sat May 19 11:21:44 2018 +0100
# Node ID 65f388195140fc4a544c42a52b93e30ec9df46ca
# Parent 8a7f058930de4b49190ad1381cba59dbfc93483d
Fix some leaks in the GTK code.
src/ChangeLog addition:
2018-05-19 Aidan Kehoe <kehoea(a)parhasard.net>
Fix some leaks in the GTK code.
* event-gtk.c (gtk_reset_key_mapping):
Avoid XKeysymToString() here, there's no need for it anymore, and
it leaks.
* glyphs-gtk.c (gtk_xpm_instantiate):
XpmCreateDataFromImage() allocates its data on the heap, and
that data needs to be freed.
diff -r 8a7f058930de -r 65f388195140 src/ChangeLog
--- a/src/ChangeLog Fri Apr 27 22:05:22 2018 +0100
+++ b/src/ChangeLog Sat May 19 11:21:44 2018 +0100
＠＠ -1,3 +1,13 ＠＠
+2018-05-19 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ Fix some leaks in the GTK code.
+ * event-gtk.c (gtk_reset_key_mapping):
+ Avoid XKeysymToString() here, there's no need for it anymore, and
+ it leaks.
+ * glyphs-gtk.c (gtk_xpm_instantiate):
+ XpmCreateDataFromImage() allocates its data on the heap, and
+ that data needs to be freed.
+
2018-04-25 Aidan Kehoe <kehoea(a)parhasard.net>
* data.c (Fatom, Flistp, Fnlistp, Fbitp, Fzerop, Ftrue_list_p):
diff -r 8a7f058930de -r 65f388195140 src/event-gtk.c
--- a/src/event-gtk.c Fri Apr 27 22:05:22 2018 +0100
+++ b/src/event-gtk.c Sat May 19 11:21:44 2018 +0100
＠＠ -1884,27 +1884,20 ＠＠
continue;
{
- Extbyte *name = XKeysymToString (keysym[0]);
Lisp_Object sym = gtk_keysym_to_emacs_keysym (keysym[0]);
- if (name)
+ if (!NILP (sym))
{
- Fputhash (build_extstring (name, Qx_keysym_encoding),
- Qsans_modifiers, hashtable);
Fputhash (sym, Qsans_modifiers, hashtable);
}
}
for (j = 1; j < keysyms_per_code; j++)
{
- if (keysym[j] != keysym[0] &&
- keysym[j] != NoSymbol)
+ if (keysym[j] != keysym[0] && keysym[j] != NoSymbol)
{
- Extbyte *name = XKeysymToString (keysym[j]);
Lisp_Object sym = gtk_keysym_to_emacs_keysym (keysym[j]);
- if (name && NILP (Fgethash (sym, hashtable, Qnil)))
+ if (!NILP (sym) && NILP (Fgethash (sym, hashtable, Qnil)))
{
- Fputhash (build_extstring (name, Qx_keysym_encoding),
- Qt, hashtable);
Fputhash (sym, Qt, hashtable);
}
}
diff -r 8a7f058930de -r 65f388195140 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c Fri Apr 27 22:05:22 2018 +0100
+++ b/src/glyphs-gtk.c Sat May 19 11:21:44 2018 +0100
＠＠ -1357,7 +1357,7 ＠＠
{
XpmImage image;
XpmInfo info;
- char** data;
+ char **cdata;
XpmCreateXpmImageFromBuffer ((char*) dstring, &image, &info);
＠＠ -1387,9 +1387,16 ＠＠
}
}
- XpmCreateDataFromXpmImage (&data, &image, &info);
-
- pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)data);
+ XpmCreateDataFromXpmImage (&cdata, &image, &info);
+ XpmFreeXpmImage (&image);
+ XpmFreeXpmInfo (&info);
+
+ pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)cdata);
+
+ if (cdata != NULL)
+ {
+ XpmFree (cdata);
+ }
}
if (color_symbols)
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments