summaryrefslogtreecommitdiff
path: root/editors/emacs22
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2005-09-05 15:15:47 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2005-09-05 15:15:47 +0000
commitf464ad3453a34958bbdfe3f5c5fb8e8acf299f27 (patch)
tree6232451f3501d8c1d2dbaa787cf7443247cbbf38 /editors/emacs22
parent- Fix reload/restart when using profiles (diff)
Fix build error.
PR: ports/85508 Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Notes
Notes: svn path=/head/; revision=142000
Diffstat (limited to 'editors/emacs22')
-rw-r--r--editors/emacs22/Makefile2
-rw-r--r--editors/emacs22/files/patch-src:xterm.c42
2 files changed, 43 insertions, 1 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 9ec0818c3385..b12417cff6eb 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= 21.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/editors/emacs22/files/patch-src:xterm.c b/editors/emacs22/files/patch-src:xterm.c
new file mode 100644
index 000000000000..01ec93bec95e
--- /dev/null
+++ b/editors/emacs22/files/patch-src:xterm.c
@@ -0,0 +1,42 @@
+--- src/xterm.c.orig Tue Oct 15 23:21:45 2002
++++ src/xterm.c Wed Aug 31 09:18:48 2005
+@@ -118,8 +118,6 @@
+ #ifdef HAVE_XAW3D
+ #include <X11/Xaw3d/Simple.h>
+ #include <X11/Xaw3d/Scrollbar.h>
+-#define ARROW_SCROLLBAR
+-#include <X11/Xaw3d/ScrollbarP.h>
+ #else /* !HAVE_XAW3D */
+ #include <X11/Xaw/Simple.h>
+ #include <X11/Xaw/Scrollbar.h>
+@@ -8863,30 +8861,12 @@
+ XawScrollbarSetThumb (widget, top, shown);
+ else
+ {
+-#ifdef HAVE_XAW3D
+- ScrollbarWidget sb = (ScrollbarWidget) widget;
+- int scroll_mode = 0;
+-
+- /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR. */
+- if (xaw3d_arrow_scroll)
+- {
+- /* Xaw3d stupidly ignores resize requests while dragging
+- so we have to make it believe it's not in dragging mode. */
+- scroll_mode = sb->scrollbar.scroll_mode;
+- if (scroll_mode == 2)
+- sb->scrollbar.scroll_mode = 0;
+- }
+-#endif
+ /* Try to make the scrolling a tad smoother. */
+ if (!xaw3d_pick_top)
+ shown = min (shown, old_shown);
+
+ XawScrollbarSetThumb (widget, top, shown);
+
+-#ifdef HAVE_XAW3D
+- if (xaw3d_arrow_scroll && scroll_mode == 2)
+- sb->scrollbar.scroll_mode = scroll_mode;
+-#endif
+ }
+ }
+ }