[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

x11-apps: Changes to 'debian-unstable'



 debian/changelog                         |    9 
 debian/control                           |    2 
 debian/patches/01_xedit_mkdir_races.diff | 2512 ++++++++++++++++++++++++++++++-
 3 files changed, 2507 insertions(+), 16 deletions(-)

New commits:
commit 6aeafec94362f648721f9848ca955e6139700635
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Mar 21 10:18:55 2010 +0100

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a8afa90..5bf0c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.5+5) UNRELEASED; urgency=low
+x11-apps (7.5+5) unstable; urgency=low
 
   [ Julien Cristau ]
   * Autoreconf xedit with the patch from 7.5+3 applied.
@@ -8,7 +8,7 @@ x11-apps (7.5+5) UNRELEASED; urgency=low
   * Add missing file renames to 01_xedit_mkdir_races.diff.
   * Bump Standards-Version to 3.8.4, no changes.
 
- -- Julien Cristau <jcristau@debian.org>  Sat, 20 Mar 2010 12:13:17 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 21 Mar 2010 10:18:52 +0100
 
 x11-apps (7.5+4) unstable; urgency=low
 

commit 44684fb0ec4b54f77b0502616b72c3295d019f15
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Mar 21 10:18:50 2010 +0100

    Bump Standards-Version to 3.8.4

diff --git a/debian/changelog b/debian/changelog
index d0ded69..a8afa90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11-apps (7.5+5) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * Add missing file renames to 01_xedit_mkdir_races.diff.
+  * Bump Standards-Version to 3.8.4, no changes.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 20 Mar 2010 12:13:17 +0100
 
diff --git a/debian/control b/debian/control
index dc61ee4..2371575 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev,
 # xmore: libxaw7-dev, libxt-dev
 # xwd: libx11-dev
 # xwud: libx11-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 

commit 61134f81e46fc473140e09fc50bbf781d8d5a6ff
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Mar 21 10:10:12 2010 +0100

    Add missing file renames to 01_xedit_mkdir_races.diff

diff --git a/debian/changelog b/debian/changelog
index fe234db..d0ded69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 x11-apps (7.5+5) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Autoreconf xedit with the patch from 7.5+3 applied.
     Really closes: #569430.
 
+  [ Brice Goglin ]
+  * Add missing file renames to 01_xedit_mkdir_races.diff.
+
  -- Julien Cristau <jcristau@debian.org>  Sat, 20 Mar 2010 12:13:17 +0100
 
 x11-apps (7.5+4) unstable; urgency=low
diff --git a/debian/patches/01_xedit_mkdir_races.diff b/debian/patches/01_xedit_mkdir_races.diff
index cf8935f..4a012ca 100644
--- a/debian/patches/01_xedit_mkdir_races.diff
+++ b/debian/patches/01_xedit_mkdir_races.diff
@@ -11,11 +11,11 @@ Date: Tue, 11 Nov 2008 09:52:18 +0000
 Subject: reorganize app default files
 
 
-diff --git a/xedit/Makefile.am b/xedit/Makefile.am
-index 1a32798..0fad032 100644
---- a/xedit/Makefile.am
-+++ b/xedit/Makefile.am
-@@ -161,33 +161,13 @@ lisp_re_tests_LDADD = -L. -lre
+Index: x11-apps/xedit/Makefile.am
+===================================================================
+--- x11-apps.orig/xedit/Makefile.am	2010-03-21 10:04:31.000000000 +0100
++++ x11-apps/xedit/Makefile.am	2010-03-21 10:04:42.000000000 +0100
+@@ -161,33 +161,13 @@
  lisp_re_tests_SOURCES = lisp/re/tests.c
  
  
@@ -52,7 +52,7 @@ index 1a32798..0fad032 100644
  lispdir = $(LISPDIR)
  dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
  	${srcdir}/lisp/modules/xedit.lsp \
-@@ -216,9 +196,9 @@ dist_progmodes_DATA = \
+@@ -216,9 +196,9 @@
  appman_PRE = xedit.man
  
  EXTRA_DIST = \
@@ -65,7 +65,7 @@ index 1a32798..0fad032 100644
  	app-defaults/Xedit-sample \
  	lisp/README \
  	lisp/TODO \
-@@ -246,7 +226,7 @@ appmandir = $(APP_MAN_DIR)
+@@ -246,7 +226,7 @@
  appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
  
  EXTRA_DIST += $(appman_PRE)
@@ -74,7 +74,7 @@ index 1a32798..0fad032 100644
  
  SED = sed
  
-@@ -267,7 +247,7 @@ MAN_SUBSTS = \
+@@ -267,7 +247,7 @@
  	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
  	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
  
@@ -83,11 +83,11 @@ index 1a32798..0fad032 100644
  
  .man.$(APP_MAN_SUFFIX):
  	sed $(MAN_SUBSTS) < $< > $@
-diff --git a/xedit/configure.ac b/xedit/configure.ac
-index 64fc0b1..dc3a947 100644
---- a/xedit/configure.ac
-+++ b/xedit/configure.ac
-@@ -41,9 +41,12 @@ AC_ARG_ENABLE(xprint,
+Index: x11-apps/xedit/configure.ac
+===================================================================
+--- x11-apps.orig/xedit/configure.ac	2010-03-21 10:04:31.000000000 +0100
++++ x11-apps/xedit/configure.ac	2010-03-21 10:04:42.000000000 +0100
+@@ -41,9 +41,12 @@
  AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes)
  if test x$enable_xprint = xyes; then
     PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8)
@@ -100,3 +100,2489 @@ index 64fc0b1..dc3a947 100644
  
  AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH],
  	    [Directory to install lisp files (default: $libdir/X11/xedit/lisp)]),
+Index: x11-apps/xedit/app-defaults/Xedit-color
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ x11-apps/xedit/app-defaults/Xedit-color	2010-03-21 10:04:31.000000000 +0100
+@@ -0,0 +1,195 @@
++! $XFree86: xc/programs/xedit/Xedit-color.ad,v 1.14 2002/11/10 23:21:56 paulo Exp $
++
++#include "Xedit"
++
++*background:			gray70
++*foreground:			gray15
++*borderColor:			gray40
++*Command.highlightThickness:	1
++*Command.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
++*Command.foreground:		gray20
++*Command.displayList:\
++foreground	gray92;\
++line		1,0,-2,0;\
++foreground	gray95;\
++line		2,1,-3,1;\
++foreground	gray74;\
++segments	3,-3,-4,-3, 2,-4,-3,-4, 1,-6,-2,-6;\
++point		-1,-1;\
++foreground	gray80;\
++line		0,0,0,-1;\
++point		-1,0
++
++*Command.translations:	#override \
++<Btn1Down>:	set-values(1, foreground, gray20, background, rgb:d/5/5) set()\n\
++Button1<Leave>: reset() set-values(1, foreground, gray20, background, gray70)\n\
++<Btn1Up>:	notify() unset()
++
++*Toggle.foreground:		gray30
++*Toggle.background:		gray82
++*Toggle.borderColor:		gray90
++*Toggle.displayList:\
++foreground	gray75;\
++segments	0,1,0,-2,-1,1,-1,-2;\
++foreground	gray80;\
++segments	0,0,-1,0,0,-1,-1,-1;\
++points		1,1,1,-2,-2,1, -2,-2
++
++*bc_label.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
++*bc_label.displayList:\
++foreground	gray92;\
++line		1,0,-2,0;\
++foreground	gray95;\
++line		2,1,-3,1;\
++foreground	gray74;\
++segments	3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5
++*bc_label.foreground:		gray20
++
++*formWindow.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
++*formWindow.displayList:\
++foreground	gray92;\
++line		1,0,-2,0;\
++foreground	gray95;\
++line		2,1,-3,1;\
++foreground	gray74;\
++segments	3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5
++*formWindow*backgroundPixmap:	ParentRelative
++*formWindow*foreground:		gray20
++*formWindow*background:		gray74
++*formWindow.labelWindow.background:	gray80
++*formWindow.labelWindow.displayList:\
++line-style	onoffdash;\
++foreground	gray30;\
++background	gray96;\
++draw-rect	3,2,15,14;\
++foreground	gray78;\
++fill-rect	4,3,15,14
++
++*dirlabel.foreground:		gray20
++*dirlabel.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
++*dirlabel.displayList:\
++foreground	gray92;\
++line		1,0,-2,0;\
++foreground	gray95;\
++line		2,1,-3,1;\
++foreground	gray74;\
++segments	3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5
++*dirwindow.background:		gray96
++
++*internalBorderColor:		gray40
++
++*Text*Text.background:		gray96
++*Text.background:		gray96
++*Text.?.background:		gray96
++*Text*cursorColor:		rgb:d/5/5
++*Text.displayList:\
++foreground	white;\
++line		1,-1,-2,-1;\
++foreground	gray88;\
++line		1,0,-2,0
++
++*Scrollbar.foreground:		rgb:a/5/5
++*Scrollbar.background:		gray60
++*Text.Scrollbar.background:	gray60
++*Scrollbar.backgroundPixmap:	gradient:horizontal?dimension=14&start=gray70&end=gray85
++*hScrollbar.backgroundPixmap:	gradient:vertical?dimension=14&start=gray85&end=gray70
++*hScrollbar.displayList:\
++foreground	gray85;\
++segments	1,-1,-2,-1,1,0,-2,0
++*vScrollbar.displayList:\
++foreground	gray85;\
++segments	0,1,0,-2,-1,1,-1,-2
++*Scrollbar.thumb:		vlines2
++*hScrollbar.thumb:		hlines2
++
++*SimpleMenu*borderWidth:		0
++*SimpleMenu*backgroundPixmap:	xlogo11?foreground=gray90&background=gray88
++*SimpleMenu*background:		gray90
++*SimpleMenu*foreground:		gray20
++*SimpleMenu.VerticalMargins:	3
++*SimpleMenu.HorizontalMargins:	3
++*SimpleMenu.SimpleMenu.VerticalMargins:	3
++*SimpleMenu.SimpleMenu.HorizontalMargins:	3
++*SimpleMenu.menuLabel.foreground:	rgb:d/5/5
++*SimpleMenu*displayList:\
++foreground	gray70;\
++lines		+2,-2,-2,-2,-2,+2;\
++foreground	gray95;\
++lines		-2,+1,+1,+1,+1,-2;\
++foreground	gray30;\
++lines		+1,-1,-1,-1,-1,+1;\
++foreground	gray80;\
++lines		-1,+0,+0,+0,+0,-1
++
++*TransientShell.backgroundPixmap:	xlogo11?foreground=gray90&background=gray87
++*TransientShell.Form.backgroundPixmap:		ParentRelative
++*TransientShell.Form.Label.backgroundPixmap:	ParentRelative
++
++*ispell*Scrollbar.borderColor:	gray50
++*ispell*Scrollbar.displayList:
++*ispell*List.background:	gray96
++*ispell*word.background:	gray96
++*ispell*word.backgroundPixmap:	XtUnspecifiedPixmap
++*ispell*word.translations:\
++<Enter>:	highlight()\n\
++<Leave>:	reset()\n\
++<Btn1Down>:	set()\n\
++<Btn1Up>:	notify() unset()\n
++*ispell*word.displayList:
++*ispell.Form.Form.borderColor:	gray80
++*ispell.Form.Form.displayList: \
++foreground	gray90;\
++lines		+1,-1,-1,-1,-1,+1;\
++foreground	gray30;\
++lines		-1,+0,+0,+0,+0,-1;\
++foreground	gray60;\
++lines		+2,-2,-2,-2,-2,+2
++*ispell*status.backgroundPixmap:	XtUnspecifiedPixmap
++*ispell*status.background:	gray96
++*ispell*terse.justify:		right
++*ispell*terse.internalWidth:	10
++*ispell*terse.background:	gray75
++*ispell*terse.foreground:	gray20
++*ispell*terse.highlightThickness:	0
++*ispell*terse.displayList:\
++line-style	solid;\
++foreground	gray70;\
++fill-arc	6,4,14,12;\
++foreground	gray90;\
++draw-arc	6,4,14,12,45,180;\
++draw-lines	+0,-1,-1,-1,-1,+0;\
++foreground	gray50;\
++draw-arc	6,4,14,12,225,180;\
++draw-lines	-2,+0,+0,+0,+0,-2;\
++foreground	gray45;\
++dashes		2,1;\
++line-style	onoffdash;\
++draw-rect	+1,+1,-2,-2
++*ispell*options.MenuButton.borderColor:	gray70
++*ispell*options.MenuButton.background:	gray78
++*ispell*options.MenuButton.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
++*ispell*options.MenuButton.displayList:\
++foreground	gray60;\
++lines		+2,-2,-2,-2,-2,+2;\
++foreground	gray95;\
++lines		-3,+1,+1,+1,+1,-3;\
++foreground	gray78;\
++points		-2,+1,+1,-2
++
++*tip.foreground:	rgb:48/48/00
++*tip.backgroundPixmap:	None
++*tip.borderWidth:	0
++*tip.rightMargin:	7
++*tip.bottomMargin:	3
++*tip.displayList:\
++foreground	rgb:f/e/8;\
++fill-rect	1,1,-2,-2;\
++foreground	rgb:d/c/6;\
++draw-segments	0,1,0,-3,1,-2,-3,-2,-2,-3,-2,1,-3,0,1,0;\
++foreground	rgb:a/8/4;\
++draw-lines	2,-1, -2,-1, -1,-2, -1,2
++
++*grip.foreground:	gray10
++*grip.displayList:\
++foreground	gray80;\
++points		0,0,0,-1,-1,-1,-1,0
+Index: x11-apps/xedit/app-defaults/Xedit-color.ad
+===================================================================
+--- x11-apps.orig/xedit/app-defaults/Xedit-color.ad	2010-03-21 10:07:03.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,195 +0,0 @@
+-! $XFree86: xc/programs/xedit/Xedit-color.ad,v 1.14 2002/11/10 23:21:56 paulo Exp $
+-
+-#include "Xedit"
+-
+-*background:			gray70
+-*foreground:			gray15
+-*borderColor:			gray40
+-*Command.highlightThickness:	1
+-*Command.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
+-*Command.foreground:		gray20
+-*Command.displayList:\
+-foreground	gray92;\
+-line		1,0,-2,0;\
+-foreground	gray95;\
+-line		2,1,-3,1;\
+-foreground	gray74;\
+-segments	3,-3,-4,-3, 2,-4,-3,-4, 1,-6,-2,-6;\
+-point		-1,-1;\
+-foreground	gray80;\
+-line		0,0,0,-1;\
+-point		-1,0
+-
+-*Command.translations:	#override \
+-<Btn1Down>:	set-values(1, foreground, gray20, background, rgb:d/5/5) set()\n\
+-Button1<Leave>: reset() set-values(1, foreground, gray20, background, gray70)\n\
+-<Btn1Up>:	notify() unset()
+-
+-*Toggle.foreground:		gray30
+-*Toggle.background:		gray82
+-*Toggle.borderColor:		gray90
+-*Toggle.displayList:\
+-foreground	gray75;\
+-segments	0,1,0,-2,-1,1,-1,-2;\
+-foreground	gray80;\
+-segments	0,0,-1,0,0,-1,-1,-1;\
+-points		1,1,1,-2,-2,1, -2,-2
+-
+-*bc_label.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
+-*bc_label.displayList:\
+-foreground	gray92;\
+-line		1,0,-2,0;\
+-foreground	gray95;\
+-line		2,1,-3,1;\
+-foreground	gray74;\
+-segments	3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5
+-*bc_label.foreground:		gray20
+-
+-*formWindow.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
+-*formWindow.displayList:\
+-foreground	gray92;\
+-line		1,0,-2,0;\
+-foreground	gray95;\
+-line		2,1,-3,1;\
+-foreground	gray74;\
+-segments	3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5
+-*formWindow*backgroundPixmap:	ParentRelative
+-*formWindow*foreground:		gray20
+-*formWindow*background:		gray74
+-*formWindow.labelWindow.background:	gray80
+-*formWindow.labelWindow.displayList:\
+-line-style	onoffdash;\
+-foreground	gray30;\
+-background	gray96;\
+-draw-rect	3,2,15,14;\
+-foreground	gray78;\
+-fill-rect	4,3,15,14
+-
+-*dirlabel.foreground:		gray20
+-*dirlabel.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
+-*dirlabel.displayList:\
+-foreground	gray92;\
+-line		1,0,-2,0;\
+-foreground	gray95;\
+-line		2,1,-3,1;\
+-foreground	gray74;\
+-segments	3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5
+-*dirwindow.background:		gray96
+-
+-*internalBorderColor:		gray40
+-
+-*Text*Text.background:		gray96
+-*Text.background:		gray96
+-*Text.?.background:		gray96
+-*Text*cursorColor:		rgb:d/5/5
+-*Text.displayList:\
+-foreground	white;\
+-line		1,-1,-2,-1;\
+-foreground	gray88;\
+-line		1,0,-2,0
+-
+-*Scrollbar.foreground:		rgb:a/5/5
+-*Scrollbar.background:		gray60
+-*Text.Scrollbar.background:	gray60
+-*Scrollbar.backgroundPixmap:	gradient:horizontal?dimension=14&start=gray70&end=gray85
+-*hScrollbar.backgroundPixmap:	gradient:vertical?dimension=14&start=gray85&end=gray70
+-*hScrollbar.displayList:\
+-foreground	gray85;\
+-segments	1,-1,-2,-1,1,0,-2,0
+-*vScrollbar.displayList:\
+-foreground	gray85;\
+-segments	0,1,0,-2,-1,1,-1,-2
+-*Scrollbar.thumb:		vlines2
+-*hScrollbar.thumb:		hlines2
+-
+-*SimpleMenu*borderWidth:		0
+-*SimpleMenu*backgroundPixmap:	xlogo11?foreground=gray90&background=gray88
+-*SimpleMenu*background:		gray90
+-*SimpleMenu*foreground:		gray20
+-*SimpleMenu.VerticalMargins:	3
+-*SimpleMenu.HorizontalMargins:	3
+-*SimpleMenu.SimpleMenu.VerticalMargins:	3
+-*SimpleMenu.SimpleMenu.HorizontalMargins:	3
+-*SimpleMenu.menuLabel.foreground:	rgb:d/5/5
+-*SimpleMenu*displayList:\
+-foreground	gray70;\
+-lines		+2,-2,-2,-2,-2,+2;\
+-foreground	gray95;\
+-lines		-2,+1,+1,+1,+1,-2;\
+-foreground	gray30;\
+-lines		+1,-1,-1,-1,-1,+1;\
+-foreground	gray80;\
+-lines		-1,+0,+0,+0,+0,-1
+-
+-*TransientShell.backgroundPixmap:	xlogo11?foreground=gray90&background=gray87
+-*TransientShell.Form.backgroundPixmap:		ParentRelative
+-*TransientShell.Form.Label.backgroundPixmap:	ParentRelative
+-
+-*ispell*Scrollbar.borderColor:	gray50
+-*ispell*Scrollbar.displayList:
+-*ispell*List.background:	gray96
+-*ispell*word.background:	gray96
+-*ispell*word.backgroundPixmap:	XtUnspecifiedPixmap
+-*ispell*word.translations:\
+-<Enter>:	highlight()\n\
+-<Leave>:	reset()\n\
+-<Btn1Down>:	set()\n\
+-<Btn1Up>:	notify() unset()\n
+-*ispell*word.displayList:
+-*ispell.Form.Form.borderColor:	gray80
+-*ispell.Form.Form.displayList: \
+-foreground	gray90;\
+-lines		+1,-1,-1,-1,-1,+1;\
+-foreground	gray30;\
+-lines		-1,+0,+0,+0,+0,-1;\
+-foreground	gray60;\
+-lines		+2,-2,-2,-2,-2,+2
+-*ispell*status.backgroundPixmap:	XtUnspecifiedPixmap
+-*ispell*status.background:	gray96
+-*ispell*terse.justify:		right
+-*ispell*terse.internalWidth:	10
+-*ispell*terse.background:	gray75
+-*ispell*terse.foreground:	gray20
+-*ispell*terse.highlightThickness:	0
+-*ispell*terse.displayList:\
+-line-style	solid;\
+-foreground	gray70;\
+-fill-arc	6,4,14,12;\
+-foreground	gray90;\
+-draw-arc	6,4,14,12,45,180;\
+-draw-lines	+0,-1,-1,-1,-1,+0;\
+-foreground	gray50;\
+-draw-arc	6,4,14,12,225,180;\
+-draw-lines	-2,+0,+0,+0,+0,-2;\
+-foreground	gray45;\
+-dashes		2,1;\
+-line-style	onoffdash;\
+-draw-rect	+1,+1,-2,-2
+-*ispell*options.MenuButton.borderColor:	gray70
+-*ispell*options.MenuButton.background:	gray78
+-*ispell*options.MenuButton.backgroundPixmap:	gradient:vertical?dimension=18&start=gray90&end=gray65
+-*ispell*options.MenuButton.displayList:\
+-foreground	gray60;\
+-lines		+2,-2,-2,-2,-2,+2;\
+-foreground	gray95;\
+-lines		-3,+1,+1,+1,+1,-3;\
+-foreground	gray78;\
+-points		-2,+1,+1,-2
+-
+-*tip.foreground:	rgb:48/48/00
+-*tip.backgroundPixmap:	None
+-*tip.borderWidth:	0
+-*tip.rightMargin:	7
+-*tip.bottomMargin:	3
+-*tip.displayList:\
+-foreground	rgb:f/e/8;\
+-fill-rect	1,1,-2,-2;\
+-foreground	rgb:d/c/6;\
+-draw-segments	0,1,0,-3,1,-2,-3,-2,-2,-3,-2,1,-3,0,1,0;\
+-foreground	rgb:a/8/4;\
+-draw-lines	2,-1, -2,-1, -1,-2, -1,2
+-
+-*grip.foreground:	gray10
+-*grip.displayList:\
+-foreground	gray80;\
+-points		0,0,0,-1,-1,-1,-1,0
+Index: x11-apps/xedit/app-defaults/Xedit-noxprint
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ x11-apps/xedit/app-defaults/Xedit-noxprint	2010-03-21 10:04:31.000000000 +0100
+@@ -0,0 +1,468 @@
++! $XFree86: xc/programs/xedit/Xedit.ad,v 1.23 2002/09/22 07:09:05 paulo Exp $
++
++*geometry:				590x440
++*input:					TRUE
++*enableBackups:				True
++*backupNameSuffix:			~
++*changedBitmap:				xlogo11
++*international:				False
++
++*hints:\
++Use Control-S and Control-R to Search.\n\
++Use Control-Shift-_ to Undo. Control-G to switch between Undo and Redo.\n\
++Use Control-A to jump to the beginning of the line.\n\
++Use Control-E to jump to the end of the line.\n\
++Use Control-T to transpose characters.\n\
++Use Control-K to cut to the end of the line. Control-Y to paste.\n\
++Use Control-Q to escape control characters.\n\
++Use Control-U[,<number>] to multiply actions. Control-G to cancel.\n\
++Use Control-Z to scroll one line up. Meta-Z to scroll one line down.\n\
++Use Meta-Q to format a paragraph.\n\
++Use Right-Button to extend selections.\n\
++Use Meta-I to insert a file.\n\
++Use Control-W to delete a selection, and/or jump to the selection mark.\n\
++Use Control-X,Control-F to find a file. Tab for filename completion.\n\
++Use Control-X,Control-S to save.\n\
++Use Control-X,Control-C to exit.\n\
++Use Control-C to paste the selection at CUT_BUFFER0.\n\
++Use Control Left-Button to popup the File Menu.\n\
++Use Control Middle-Button to popup the Edit Menu.\n\
++Use Control Right-Button to popup the Option Menu.\n\
++Use Control-X,Tab to Indent.\n\
++Use Control-X,0 to delete current splitted window.\n\
++Use Control-X,1 to delete other splitted window.\n\
++Use Control-X,2 to split the window vertically.\n\
++Use Control-X,3 to split the window horizontally.\n\
++Use Control-X,b to switch to another file.\n\
++Use Control-X,d to list directory. Control-G to Cancel.\n\
++Use Control-X,k to close file being edited.\n\
++Use Control-X,o to switch to another splitted window.\n\
++Use Control-X,u to undo. Control-G to switch between Undo and Redo.\n\
++Use Insert to toggle Overwrite mode.\n\
++Use Control-G to interrupt the lisp subprocess.\n\
++Use Escape to enter or leave regex search and replace mode.\n\
++Use Alt-. to search tags for the selected symbol or find the next match.
++
++*formWindow*defaultDistance:		2
++*formWindow.?.borderWidth:		0
++*formWindow.min:			18
++*formWindow.max:			18
++*formWindow.showGrip:			False
++*positionWindow.fromHoriz:		labelWindow
++*positionWindow.horizDistance:		0
++*positionWindow.left:			chainRight
++*positionWindow.right:			chainRight
++*positionWindow.width:			90
++*positionWindow.label:			error
++*positionWindow.justify:		left
++*labelWindow*justify:			center
++*labelWindow*label:			no file yet
++*labelWindow.left:			chainLeft
++*labelWindow.right:			chainRight
++
++*quit.label:				Quit
++*quit.tip:				Close xedit window
++*save.label:				Save
++*save.tip:				Save current file
++*load.label:				Load
++*load.tip:				Load a new file
++
++*buttons*orientation:			horizontal
++*buttons*showGrip:			False
++*buttons.min:				18
++
++*messageWindow.height:			50
++*messageWindow.min:			18
++*Paned*Text*allowResize:		True
++
++*messageWindow.autoFill:		False
++*messageWindow.scrollVertical:		Never
++
++*editWindow.autoFill:			False
++*editWindow.scrollVertical:		Always
++*editWindow.showGrip:			True
++xedit.textSource*enableUndo:		True
++
++*bc_label*label:			Use Control-S and Control-R to Search.
++*bc_label*showGrip:			False
++*bc_label.min:				18
++
++*dirlabel.showGrip:			False
++*dirlabel.min:				18
++*dirlabel.max:				18
++
++*dirwindow.defaultColumns:		0
++*dirwindow.verticalList:		True
++
++*viewport.forceBars:			True
++*viewport.allowVert:			1
++
++*insertFile*text.width:			141
++*insertFile*text.?.pieceSize:		256
++*search*searchText.width:		157
++*search*replaceText.width:		157
++*search*case.horizDistance:		25
++*search*Text.?.pieceSize:		256
++
++*SimpleMenu.BackingStore:		NotUseful
++*SimpleMenu.menuLabel.vertSpace:	80
++*SimpleMenu.SmeBSB.HorizontalMargins:	16
++*SimpleMenu.justify:			center
++*SimpleMenu.menuLabel.height:		250
++*SimpleMenu*cursor:			left_ptr
++
++*fileMenu.label:			File Menu
++*optionsMenu.label:			Option Menu
++*optionsMenu.ispell.label:		ispell...
++*editMenu.label:			Edit Menu
++*editMenu.wrapMenuItem.label:		Wrapping
++*editMenu.wrapMenuItem.leftBitmap:	menu12
++*wrapMenu.never.label:			Never
++*wrapMenu.line.label:			Line
++*wrapMenu.word.label:			Word
++*editMenu.autoFill.label:		Auto Fill
++*editMenu.justifyMenuItem.label:	Justification
++*editMenu.justifyMenuItem.leftBitmap:	menu12
++*justifyMenu.left.label:		Left
++*justifyMenu.right.label:		Right
++*justifyMenu.center.label:		Center
++*justifyMenu.full.label:		Full
++*editMenu.breakColumns.label:		Break Columns...
++*editMenu.scrollMenuItem.label:		Scrollbars
++*editMenu.scrollMenuItem.leftBitmap:	menu12
++*scrollMenu.vertical.label:		Vertical
++*scrollMenu.horizontal.label:		Horizontal
++*editMenu.modeMenuItem.leftBitmap:	menu12
++*editMenu.modeMenuItem.label:		Edit Mode
++*editModes.none.label:			Plain/None
++
++*TransientShell*Text.translations: #override \
++c<Key>S:	no-op(r)\n\
++c<Key>R:	no-op(r)\n\
++m<Key>I:	no-op(r)
++
++*search.translations: #override \
++<Create>:get-values(my, $w, width, $h, height)\
++	set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False)
++
++*insertFile.title:			Insert File
++*insertFile.translations: #override \
++<Create>:get-values(my, $w, width, $h, height)\
++	set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False)
++
++*baseTranslations: #override \
++<Ctrl>X,<Ctrl>C:quit()\n\
++<Ctrl>X,<Ctrl>S:save-file()\n\
++<Ctrl>X,<Ctrl>F:find-file()\n\
++<Key>Escape:	line-edit()
++
++*messageWindow.Translations: #override \
++<Ctrl>X,<Ctrl>C:quit()\n\
++<Ctrl>X,<Ctrl>S:save-file()\n\
++<Ctrl>X,<Ctrl>F:find-file()\n\
++<Enter>:	no-op()\n\
++<Leave>:	no-op()\n\
++<Btn1Down>:	set-keyboard-focus() select-start()
++
++*searchText.Translations: #override \
++<Enter>:	no-op()\n\
++<Leave>:	no-op()\n\
++<Btn1Down>:	set-keyboard-focus() select-start()
++
++*replaceText.Translations: #override \
++<Enter>:	no-op()\n\
++<Leave>:	no-op()\n\
++<Btn1Down>:	set-keyboard-focus() select-start()
++
++*editWindow.translations: #override \
++<Ctrl>X,<Ctrl>E:lisp-eval()\n\
++<Ctrl>X,<Key>Tab:indent()\n\
++<Ctrl>X,:<Key>0:delete-window(current)\n\
++<Ctrl>X,:<Key>1:delete-window(other)\n\
++<Ctrl>X,:<Key>2:split-window(vertical)\n\
++<Ctrl>X,:<Key>3:split-window(horizontal)\n\
++<Ctrl>X,!l @Num_Lock<Key>b:switch-source()\n\
++<Ctrl>X,!l <Key>b:switch-source()\n\
++<Ctrl>X,!@Num_Lock<Key>b:switch-source()\n\
++<Ctrl>X,!<Key>b:switch-source()\n\
++<Ctrl>X,!l @Num_Lock<Key>d:dir-window()\n\
++<Ctrl>X,!l <Key>d:dir-window()\n\
++<Ctrl>X,!@Num_Lock<Key>d:dir-window()\n\
++<Ctrl>X,!<Key>d:dir-window()\n\
++<Ctrl>X,!l @Num_Lock<Key>k:kill-file()\n\
++<Ctrl>X,!l <Key>k:kill-file()\n\
++<Ctrl>X,!@Num_Lock<Key>k:kill-file()\n\
++<Ctrl>X,!<Key>k:kill-file()\n\
++<Ctrl>X,!l @Num_Lock<Key>o:other-window()\n\
++<Ctrl>X,!l <Key>o:other-window()\n\
++<Ctrl>X,!@Num_Lock<Key>o:other-window()\n\
++<Ctrl>X,!<Key>o:other-window()\n\
++<Ctrl>X,!l @Num_Lock<Key>u:undo()\n\
++<Ctrl>X,!l <Key>u:undo()\n\
++<Ctrl>X,!@Num_Lock<Key>u:undo()\n\
++<Ctrl>X,!<Key>u:undo()\n\
++<Ctrl>G:	xedit-keyboard-reset()\n\
++<Ctrl>J:	xedit-print-lisp-eval()\n\
++:m<Key>.:	tags()\n\
++<Key>Tab:	insert-char()\n\
++!l @Num_Lock<Key>b:insert-char()\n\
++!l <Key>b:	insert-char()\n\
++!@Num_Lock<Key>b:insert-char()\n\
++!<Key>b:	insert-char()\n\
++!l @Num_Lock<Key>d:insert-char()\n\
++!l <Key>d:	insert-char()\n\
++!@Num_Lock<Key>d:insert-char()\n\
++!<Key>d:	insert-char()\n\
++!l <Key>k:	insert-char()\n\
++!l @Num_Lock<Key>k:insert-char()\n\
++!@Num_Lock<Key>k:insert-char()\n\
++!<Key>k:	insert-char()\n\
++!l @Num_Lock<Key>o:insert-char()\n\
++!l <Key>o:	insert-char()\n\
++!@Num_Lock<Key>o:insert-char()\n\
++!<Key>o:	insert-char()\n\
++!l @Num_Lock<Key>u:insert-char()\n\
++!l <Key>u:	insert-char()\n\
++!@Num_Lock<Key>u:insert-char()\n\
++!<Key>u:	insert-char()\n\
++~s <Key>Insert:	toggle-overwrite()\n\
++c l @Num_Lock<Btn1Down>:xedit-focus() popup-menu(fileMenu)\n\
++c @Num_Lock<Btn1Down>:xedit-focus() popup-menu(fileMenu)\n\
++c l<Btn1Down>:	xedit-focus() popup-menu(fileMenu)\n\
++c<Btn1Down>:	xedit-focus() popup-menu(fileMenu)\n\
++c l @Num_Lock<Btn2Down>:xedit-focus() popup-menu(editMenu)\n\
++c @Num_Lock<Btn2Down>:xedit-focus() popup-menu(editMenu)\n\
++c l<Btn2Down>:	xedit-focus() popup-menu(editMenu)\n\
++c<Btn2Down>:	xedit-focus() popup-menu(editMenu)\n\
++c l @Num_Lock<Btn3Down>:xedit-focus() popup-menu(optionsMenu)\n\
++c @Num_Lock<Btn3Down>:xedit-focus() popup-menu(optionsMenu)\n\
++c l<Btn3Down>:xedit-focus() popup-menu(optionsMenu)\n\
++c<Btn3Down>:	xedit-focus() popup-menu(optionsMenu)\n\
++<Btn1Down>:	xedit-focus() select-start()\n\
++<Btn4Down>:	scroll-one-line-down()\n\
++<Btn5Down>:	scroll-one-line-up()
++
++*filename.?.pieceSize:			256
++*filename.translations: #override \
++c<Key>S:	no-op(r)\n\
++c<Key>R:	no-op(r)\n\
++m<Key>I:	no-op(r)\n\
++c<Key>G:	cancel-find-file()\n\
++<Key>Return:	load-file()\n\
++<Key>Tab:	file-completion(h)\n\
++<Key>Escape:	cancel-find-file()\n\
++<Enter>:	no-op()\n\
++<Leave>:	no-op()\n\
++<Btn1Down>:	set-keyboard-focus() select-start()
++
++*ispell.translations:	#override \
++<Message>WM_PROTOCOLS:	ispell(end)
++
++! Sample dictionary, word chars and text mode resources setup
++!*ispell.dictionary:			br
++!*ispell.dictionaries:			br american americanmed+ english
++!*ispell*br.wordChars:			���������-
++*ispell.ispellCommand:			/usr/bin/aspell -B -m
++*ispell.lookCommand:			/bin/egrep
++!*ispell*text.skipLines:		.#
++
++*ispell.geometry:			0x0
++*ispell.minWidth:			320
++*ispell.minHeight:			245
++*ispell*Label.borderWidth:		0
++*ispell*Label.internalHeight:		4
++*ispell*Label.justify:			right
++*ispell*Label.width:			112
++*ispell*Label.left:			chainLeft
++*ispell*Label.right:			chainLeft
++*ispell*Label.top:			chainTop
++*ispell*Label.bottom:			chainTop
++*ispell*mispelled.label:		Misspelled word:
++*ispell*mispelled.top:			chainTop
++*ispell*mispelled.bottom:		chainTop
++*ispell*mispelled.internalWidth:	0
++*ispell*repeated.label:			Repeated words:
++*ispell*repeated.internalWidth:		0
++*ispell*replacement.label:		Replace with:
++*ispell*word.fromHoriz:			mispelled
++*ispell*word.justify:			left
++*ispell*word.borderWidth:		1
++*ispell*word.internalWidth:		4
++*ispell*word.internalHeight:		3
++*ispell*word.width:			194
++*ispell*word.left:			chainLeft
++*ispell*word.right:			chainRight
++*ispell*word.top:			chainTop
++*ispell*word.bottom:			chainTop
++*ispell*word.label:
++*ispell*word.tip:			Press here to select this text
++*ispell*word.highlightThickness:	0
++*ispell*text.fromHoriz:			replacement
++*ispell*replacement.fromVert:		mispelled
++*ispell*replacement.internalWidth:	0
++*ispell*form.text.fromVert:		word
++*ispell*form.text.width:		194
++*ispell*form.text.top:			chainTop
++*ispell*form.text.bottom:		chainTop
++*ispell*form.text.left:			chainLeft
++*ispell*form.text.right:		chainRight
++*ispell*form.text.leftMargin:		4
++*ispell*form.text.?.pieceSize:		256
++*ispell*suggestions.label:		Suggestions:
++*ispell*suggestions.fromVert:		replacement
++*ispell*suggestions.internalWidth:	0
++*ispell*viewport.fromHoriz:		suggestions
++*ispell*viewport.fromVert:		text
++*ispell*viewport.width:			194
++*ispell*viewport.height:		143
++*ispell*viewport.top:			chainTop
++*ispell*viewport.bottom:		chainBottom
++*ispell*viewport.left:			chainLeft
++*ispell*viewport.right:			chainRight
++*ispell*viewport.forceBars:		1
++*ispell*viewport.allowVert:		1
++*ispell*list.defaultColumns:		1
++*ispell*list.longest:			16384
++*ispell*commands.vertDistance:		5
++*ispell*commands.fromVert:		suggestions
++*ispell*commands.top:			chainBottom
++*ispell*commands.bottom:		chainBottom
++*ispell*commands.right:			chainLeft
++*ispell*commands.left:			chainLeft
++*ispell*check.label:			Check
++*ispell*check.width:			54
++*ispell*check.tip:			Ask ispell about the word in the text field
++*ispell*look.label:			Look
++*ispell*look.fromHoriz:			check
++*ispell*look.horizDistance:		0
++*ispell*look.width:			46
++*ispell*look.tip:			Runs the look command
++*ispell*undo.fromVert:			check
++*ispell*undo.label:			Undo
++*ispell*undo.width:			102
++*ispell*undo.tip:			Undo last action
++*ispell*replace.fromVert:		undo
++*ispell*replace.label:			Replace
++*ispell*replace.tip:			Replace occurence of the word
++*ispell*replaceAll.fromVert:		undo
++*ispell*replaceAll.fromHoriz:		replace
++*ispell*replaceAll.label:		All
++*ispell*replaceAll.tip:			Replace all occurences of the word
++*ispell*ignore.fromVert:		replace
++*ispell*ignore.label:			Ignore
++*ispell*ignore.tip:			Ignore this word
++*ispell*ignoreAll.fromVert:		replaceAll
++*ispell*ignoreAll.fromHoriz:		ignore
++*ispell*ignoreAll.label:		All
++*ispell*ignoreAll.tip:			Ignore all ocurrences of the word
++*ispell*add.fromVert:			ignore
++*ispell*add.label:			Add
++*ispell*add.width:			50
++*ispell*add.tip:			Add word to your private dictionary
++*ispell*addUncap.fromVert:		ignoreAll
++*ispell*addUncap.fromHoriz:		add
++*ispell*addUncap.label:			Uncap
++*ispell*addUncap.horizDistance:		0
++*ispell*addUncap.width:			50
++*ispell*addUncap.tip:			Add word uncapitalized, to your private dictionary
++*ispell*suspend.fromVert:		add
++*ispell*suspend.label:			Suspend
++*ispell*suspend.width:			57
++*ispell*suspend.tip:			Suspend ispell execution
++*ispell*cancel.fromHoriz:		suspend
++*ispell*cancel.fromVert:		addUncap
++*ispell*cancel.label:			Close
++*ispell*cancel.width:			43
++*ispell*cancel.horizDistance:		0
++*ispell*cancel.tip:			Terminates ispell process
++*ispell*replace.width:			65
++*ispell*ignore.width:			65
++*ispell*replaceAll.width:		35
++*ispell*replaceAll.horizDistance:	0
++*ispell*ignoreAll.width:		35
++*ispell*ignoreAll.horizDistance:	0
++*ispell*terse.fromVert:			cancel
++*ispell*terse.Label:			Terse Mode
++*ispell*terse.width:			104
++*ispell*terse.borderWidth:		0
++*ispell*terse.tip:			Switch terse mode
++*ispell*status.fromVert:		viewport
++*ispell*status.fromHoriz:		suggestions
++*ispell*status.top:			chainBottom
++*ispell*status.bottom:			chainBottom
++*ispell*status.left:			chainLeft
++*ispell*status.right:			chainRight
++*ispell*status.width:			194
++*ispell*status.borderWidth:		1
++*ispell*status.justify:			left
++*ispell*status.internalHeight:		2
++*ispell*status.vertDistance:		2
++*ispell*options.fromVert:		status
++*ispell*options.fromHoriz:		commands
++*ispell*options.bottom:			chainBottom
++*ispell*options.top:			chainBottom
++*ispell*options.left:			chainLeft
++*ispell*options.right:			chainRight
++*ispell*options.dict.width:		121
++*ispell*options.horizDistance:		2
++*ispell*options.vertDistance:		2
++*ispell*options.defaultDistance:	2
++*ispell*dict.highlightThickness:	0
++*ispell*dict.justify:			left
++*ispell*dict.resizable:			False
++*ispell*dict.leftBitmap:		menu12
++*ispell*dict.label:			Dictionary
++*ispell*dict.tip:			Change dictionary
++*ispell*options.format.width:		65
++*ispell*format.highlightThickness:	0
++*ispell*format.justify:			left
++*ispell*format.resizable:		False
++*ispell*format.leftBitmap:		menu12
++*ispell*format.fromHoriz:		dict
++*ispell*format.horizDistance:		0
++*ispell*format.tip:			Select text type
++
++*columns.minWidth:			140
++*columns.minHeight:			76
++*columns.maxWidth:			140
++*columns.maxHeight:			76
++*columns.form*defaultDistance:		4
++*columns*left:				chainLeft
++*columns*right:				chainLeft
++*columns*top:				chainTop
++*columns*bottom:			chainTop
++*columns*Label.width:			96
++*columns*Label.borderWidth:		0
++*columns*Label.internalHeight:		4
++*columns*Label.internalWidth:		2
++*columns*Label.justify:			right
++*columns*Text.width:			30


Reply to: