Bugfix update to emacs-27.2
Tested by Timo Myyra and krw@
This commit is contained in:
parent
2aa3a96096
commit
a18591898f
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.97 2021/02/28 10:47:09 yasuoka Exp $
|
||||
# $OpenBSD: Makefile,v 1.98 2021/04/04 23:43:25 jca Exp $
|
||||
|
||||
COMMENT= GNU editor: extensible, customizable, self-documenting
|
||||
|
||||
VERSION= 27.1
|
||||
REVISION= 0
|
||||
VERSION= 27.2
|
||||
DISTNAME= emacs-${VERSION}
|
||||
|
||||
CATEGORIES= editors
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (emacs-27.1.tar.xz) = SkwSj5FfyTfWHt/Cc8mBBnEbVAyb481dLiubWy8XLkE=
|
||||
SIZE (emacs-27.1.tar.xz) = 43752012
|
||||
SHA256 (emacs-27.2.tar.xz) = tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=
|
||||
SIZE (emacs-27.2.tar.xz) = 44624480
|
||||
|
@ -1,51 +0,0 @@
|
||||
$OpenBSD: patch-src_gtkutil_c,v 1.1 2021/02/28 10:47:09 yasuoka Exp $
|
||||
|
||||
Avoid crashes in Mew due to corrupted tool-bar label
|
||||
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=46791
|
||||
|
||||
Index: src/gtkutil.c
|
||||
--- src/gtkutil.c.orig
|
||||
+++ src/gtkutil.c
|
||||
@@ -5019,11 +5019,10 @@ update_frame_tool_bar (struct frame *f)
|
||||
GtkWidget *wbutton = NULL;
|
||||
Lisp_Object specified_file;
|
||||
bool vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY));
|
||||
- const char *label
|
||||
- = (EQ (style, Qimage) || (vert_only && horiz)) ? NULL
|
||||
- : STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
|
||||
- ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL))
|
||||
- : "";
|
||||
+ Lisp_Object label
|
||||
+ = (EQ (style, Qimage) || (vert_only && horiz))
|
||||
+ ? Qnil
|
||||
+ : PROP (TOOL_BAR_ITEM_LABEL);
|
||||
|
||||
ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j);
|
||||
|
||||
@@ -5136,8 +5135,11 @@ update_frame_tool_bar (struct frame *f)
|
||||
|
||||
/* If there is an existing widget, check if it's stale; if so,
|
||||
remove it and make a new tool item from scratch. */
|
||||
- if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name,
|
||||
- img, label, horiz))
|
||||
+ if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name, img,
|
||||
+ NILP (label)
|
||||
+ ? NULL
|
||||
+ : STRINGP (label) ? SSDATA (label) : "",
|
||||
+ horiz))
|
||||
{
|
||||
gtk_container_remove (GTK_CONTAINER (wtoolbar),
|
||||
GTK_WIDGET (ti));
|
||||
@@ -5194,7 +5196,11 @@ update_frame_tool_bar (struct frame *f)
|
||||
#else
|
||||
if (w) gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
|
||||
#endif
|
||||
- ti = xg_make_tool_item (f, w, &wbutton, label, i, horiz, text_image);
|
||||
+ ti = xg_make_tool_item (f, w, &wbutton,
|
||||
+ NILP (label)
|
||||
+ ? NULL
|
||||
+ : STRINGP (label) ? SSDATA (label) : "",
|
||||
+ i, horiz, text_image);
|
||||
gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.25 2020/08/23 09:55:01 jca Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.26 2021/04/04 23:43:25 jca Exp $
|
||||
@option is-branch
|
||||
@pkgpath editors/emacs21,-el
|
||||
@pkgpath editors/emacs21,-leim
|
||||
@ -1026,6 +1026,7 @@ share/emacs/${VERSION}/etc/tutorials/TUTORIAL.sv
|
||||
share/emacs/${VERSION}/etc/tutorials/TUTORIAL.th
|
||||
share/emacs/${VERSION}/etc/tutorials/TUTORIAL.translators
|
||||
share/emacs/${VERSION}/etc/tutorials/TUTORIAL.zh
|
||||
share/emacs/${VERSION}/etc/w32-feature.el
|
||||
share/emacs/${VERSION}/etc/yow.lines
|
||||
share/emacs/${VERSION}/lisp/
|
||||
share/emacs/${VERSION}/lisp/COPYING
|
||||
@ -3346,6 +3347,8 @@ share/emacs/${VERSION}/lisp/org/org-plot.el.gz
|
||||
share/emacs/${VERSION}/lisp/org/org-plot.elc
|
||||
share/emacs/${VERSION}/lisp/org/org-protocol.el.gz
|
||||
share/emacs/${VERSION}/lisp/org/org-protocol.elc
|
||||
share/emacs/${VERSION}/lisp/org/org-refile.el.gz
|
||||
share/emacs/${VERSION}/lisp/org/org-refile.elc
|
||||
share/emacs/${VERSION}/lisp/org/org-src.el.gz
|
||||
share/emacs/${VERSION}/lisp/org/org-src.elc
|
||||
share/emacs/${VERSION}/lisp/org/org-table.el.gz
|
||||
|
Loading…
Reference in New Issue
Block a user