Make sure make-annotation does exist before calling it. We cannot have

buttons if it doesn't, but the file requester can still be used with
enter and ctrl-g.

Should mince, stomp on and squish PR pkg/51036

4 files changed, 28 insertions, 7 deletions

diff --git a/editors/xemacs/MESSAGE b/editors/xemacs/MESSAGE
index 9c932852636..ba5a8f3121e 100644
--- a/editors/xemacs/MESSAGE
+++ b/editors/xemacs/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2017/01/22 19:18:33 abs Exp $
+$NetBSD: MESSAGE,v 1.6 2017/01/24 20:31:14 hauke Exp $
 
 * See ${PREFIX}/lib/${DISTNAME}/etc/sample.init.el for a sample user
   configuration.  Copying it to ~/.xemacs/init.el is an easy start.
@@ -7,8 +7,6 @@ $NetBSD: MESSAGE,v 1.5 2017/01/22 19:18:33 abs Exp $
 * See ${PREFIX}/lib/${DISTNAME}/etc/sample.Xdefaults for a sample X
   resource setting.
 
-* Install `xemacs-packages' for a full set of support packages. Without
-  this UI operations such as File>Open will fail with
-    "Symbol's function definition is void: make-annotation"
+* Install `xemacs-packages' for a full set of support packages.
 
 ===========================================================================
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 72dfdab7017..4e176dae4f2 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.22 2016/12/30 23:27:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.23 2017/01/24 20:31:14 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
 
 DISTNAME=	xemacs-21.4.24
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
@@ -97,6 +97,7 @@ post-extract:
 
 pre-build:
 	rm -f ${WRKSRC}/etc/ctags.1.orig
+	rm -f ${WRKSRC}/lisp/gui.el.orig
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 77898ed15d3..61d1db36122 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2017/01/22 14:06:07 abs Exp $
+$NetBSD: distinfo,v 1.27 2017/01/24 20:31:14 hauke Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
@@ -6,6 +6,7 @@ SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5
 Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
 SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7
 SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
+SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
 SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
 SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14
 SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104
diff --git a/editors/xemacs/patches/patch-lisp_gui.el b/editors/xemacs/patches/patch-lisp_gui.el
new file mode 100644
index 00000000000..7a4c07f1bcd
--- /dev/null
+++ b/editors/xemacs/patches/patch-lisp_gui.el
@@ -0,0 +1,21 @@
+$NetBSD: patch-lisp_gui.el,v 1.1 2017/01/24 20:31:14 hauke Exp $
+
+Do not call xemacs-package functions from standalone xemacs
+without checking they are aveilable.
+
+--- lisp/gui.el.orig	2015-03-25 11:25:33.000000000 +0000
++++ lisp/gui.el
+@@ -117,7 +117,11 @@ When ACTION is called, the buffer contai
+ (defun insert-gui-button (button &optional pos buffer)
+   "Insert GUI button BUTTON at POS in BUFFER."
+   (check-argument-type 'gui-button-p button)
+-  (make-annotation (make-glyph button)
+-			       pos 'text buffer nil))
++  ;; make-annotation is from xemacs-packages lisp/xemacs-base/annotations.el
++  ;; so not available for standalone, package-less XEmacs
++  (if (fboundp 'make-annotation) 
++      (make-annotation (make-glyph button)
++		       pos 'text buffer nil)
++    (make-glyph button)))
+ 
+ ;;; gui.el ends here