1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
* Building --with-x=yes and --with-x=no creates very few differences now.
Patch: fix-x-vs-no-x-diffs.diff
Author: Rob Browning <rlb@defaultvalue.org>
Applied-by: Rob Browning <rlb@defaultvalue.org>
Eliminate as many differences between --with-x=yes and --with-x=no
versions of emacs as possible, and accommodate the rest.
(The patch was written in consulatation with emacs-devel.)
Make sure that the DOC files generated with and without X,
i.e. --with-x=yes and --with-x=no, are the same.
Make sure that cus-dep.el generation doesn't fail by fixing some
problems with a couple of defcustom forms. Without the fix, the
computation of custom-where in cus-dep.el fails because the defcustom
eval fails. The gnus-art.el fix does copy/paste the value of
gnus-article-compface-xbm from gnus-ems to gnus-art. This doesn't
look like it should hurt anything, but it'd be better to fix this
"right" in the long term.
Sort the custom-group entries in cus-dep before generating
custom-loads so the output doesn't differ from run-to-run.
Add a tag so that we can insert our own name for the fns-*.el file
into help.el at package build time. fns-*.el is the only difference
remaining, and we just allow two versions, fns-*-x.el and fns-*-nox.el
and arrange for help.el to load the right one.
diff -ru 0/lisp/scroll-bar.el 1/lisp/scroll-bar.el
--- 0/lisp/scroll-bar.el 2002-09-15 17:14:25.000000000 -0500
+++ 1/lisp/scroll-bar.el 2002-09-15 17:15:39.000000000 -0500
@@ -99,6 +99,7 @@
(const left)
(const right))
:group 'frames
+ :initialize 'custom-initialize-default
:set 'set-scroll-bar-mode-1)
;; We just set scroll-bar-mode, but that was the default.
diff -ru 0/lisp/gnus/gnus-art.el 1/lisp/gnus/gnus-art.el
--- 0/lisp/gnus/gnus-art.el 2002-03-22 11:03:55.000000000 -0600
+++ 1/lisp/gnus/gnus-art.el 2002-09-15 16:42:46.000000000 -0500
@@ -207,7 +207,10 @@
(if (and (fboundp 'image-type-available-p)
(image-type-available-p 'xbm))
'gnus-article-display-xface
- (if gnus-article-compface-xbm
+ (if (or (and (boundp 'gnus-article-compface-xbm)
+ gnus-article-compface-xbm)
+ (eq 0 (string-match "#define"
+ (shell-command-to-string "uncompface -X"))))
"{ echo '/* Width=48, Height=48 */'; uncompface; } | display -"
"{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
display -"))
--- 0/lisp/cus-dep.el 2002-07-30 20:15:40.000000000 -0500
+++ 1/lisp/cus-dep.el 2002-09-15 18:20:53.000000000 -0500
@@ -35,7 +35,7 @@
"Batch function to extract custom dependencies from .el files.
Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
(let ((enable-local-eval nil)
- (all-subdirs command-line-args-left)
+ (all-subdirs (sort command-line-args-left 'string<))
(start-directory default-directory))
(get-buffer-create " cus-dep temp")
(set-buffer " cus-dep temp")
@@ -86,6 +86,10 @@
(let ((members (get symbol 'custom-group))
item where found)
(when members
+ ;; So x and no-x builds won't differ.
+ (setq members
+ (sort (copy-sequence members)
+ (lambda (x y) (string< (car x) (car y)))))
(while members
(setq item (car (car members))
members (cdr members)
--- 0/lisp/help.el 2001-10-21 20:26:01.000000000 -0500
+++ 1/lisp/help.el 2002-09-19 23:29:30.000000000 -0500
@@ -612,7 +612,10 @@
;; fns-XX.YY.ZZ.el does not work on DOS filesystem.
(if (eq system-type 'ms-dos)
"fns.el"
- (format "fns-%s.el" emacs-version))
+ ;; Modified for Debian to support x and nox parallel installs.
+ (format "fns-%s-%s.el"
+ emacs-version
+ (or (and (featurep 'x-toolkit) "x") "nox")))
exec-directory)
;; The file name fns-%s.el already has a .el extension.
nil nil t)
|
