[PATCH] Bind & autoload cperl-perldoc, cperl-perldoc-at-point
19 years, 2 months
Aidan Kehoe
Aidan Kehoe
Autoloading and binding cperl-perldoc allows you to conveniently browse the
Perl documentation without ever having loaded a Perl file in this
session. (In my case, for example, I tend to edit Perl on a remote server
and read documentation locally.)
XEmacs people, as I mentioned this in my
16860.42135.703800.617756(a)parhasard.net of January the sixth, to which there
were several energetic disagreements with other points, and as there were no
objections there to this point, I'm going ahead with the commit.
xemacs-packages/perl-modes/ChangeLog addition:
2005-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* cperl-mode.el: Autoload cperl-perldoc, cperl-perldoc-at-point.
* cperl-mode.el (cperl-mode-map):
Bind them to C-cC-hp, C-cC-hP, respectively.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/perl-modes/cperl-mode.el
Index: xemacs-packages/perl-modes/cperl-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/perl-modes/cperl-mode.el,v
retrieving revision 1.6
diff -u -r1.6 cperl-mode.el
--- xemacs-packages/perl-modes/cperl-mode.el 2004/08/13 10:06:44 1.6
+++ xemacs-packages/perl-modes/cperl-mode.el 2005/02/09 01:46:34
＠＠ -2172,6 +2172,10 ＠＠
[(control c) (control h) v]))
(cperl-define-key "\C-c\C-hf" 'cperl-info-on-current-command
[(control c) (control h) f])
+ (cperl-define-key "\C-c\C-hp" 'cperl-perldoc
+ [(control c) (control h) p])
+ (cperl-define-key "\C-c\C-hP" 'cperl-perldoc-at-point
+ [(control c) (control h) P])
(cperl-define-key "\C-c\C-hv"
;;(concat (char-to-string help-char) "v") ; does not work
'cperl-get-help
＠＠ -8142,6 +8146,7 ＠＠
;;; Getting help on modules in C-h f ?
;;; This is a modified version of `man'.
;;; Need to teach it how to lookup functions
+;;;###autoload
(defun cperl-perldoc (word)
"Run `perldoc' on WORD."
(interactive
＠＠ -8173,6 +8178,7 ＠＠
(t
(Man-getpage-in-background word)))))
+;;;###autoload
(defun cperl-perldoc-at-point ()
"Run a `perldoc' on the word around point."
(interactive)
--
“Ah come on now Ted, a Volkswagen with a mind of its own, driving all over
the place and going mad, if that’s not scary I don’t know what is.”
- 2 participants
- 1 comments
[COMMIT] Fix a comment in lisp/mule/european.el
19 years, 2 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed.
Okay, Jerry, the changed version shouldn't have read _exactly_ like you
suggested, despite what my follow-up mail said, but the comment I committed
was still wrong.
lisp/ChangeLog addition:
2005-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/european.el: Fix a comment typo pointed out by Jerry James
in psu0olr8z7.fsf(a)diannao.ittc.ku.edu.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/mule/european.el
Index: lisp/mule/european.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/european.el,v
retrieving revision 1.10
diff -u -r1.10 european.el
--- lisp/mule/european.el 2005/02/09 15:29:12 1.10
+++ lisp/mule/european.el 2005/02/09 17:59:48
＠＠ -4,7 +4,7 ＠＠
;; Licensed to the Free Software Foundation.
;; Copyright (C) 1997 MORIOKA Tomohiko
;; Copyright (C) 2001 Ben Wing.
-;; Copyright (C) 2002 Free Software Foundation
+;; Copyright (C) 2002, 2005 Free Software Foundation
;; Keywords: multilingual, European
＠＠ -27,8 +27,8 ＠＠
;;; Commentary:
-;; For Europeans, seven coded character sets ISO8859-1,2,3,4,9,10 are supported.
-;; Note: ISO 8859/15 (Latin-9) is supported via the latin-unity package.
+;; For Roman-alphabet-using Europeans, eight coded character sets,
+;; ISO8859-1,2,3,4,9,14,15,16 are supported.
;; #### latin.el would be a better name for this file.
--
“Ah come on now Ted, a Volkswagen with a mind of its own, driving all over
the place and going mad, if that’s not scary I don’t know what is.”
- 1 participants
- 0 comments
[COMMIT] Make ISO 8859-16 and its Unicode mapping availabnle
19 years, 2 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2005-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/european.el: Create the 8859-16 character set and coding system.
* mule/european.el (latin-iso8859-16): Make the character set available.
2005-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el (load-unicode-tables):
Initialise mapping tables for ISO
8859-16--cf. s3tk6pieyuk.fsf(a)magellan.suse.de , DOUBLE LOW-9
QUOTATION MARK is very much used for German and in Central Europe.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/mule/european.el lisp/unicode.el
Index: lisp/unicode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/unicode.el,v
retrieving revision 1.10
diff -u -r1.10 unicode.el
--- lisp/unicode.el 2005/02/08 23:59:51 1.10
+++ lisp/unicode.el 2005/02/09 15:19:05
＠＠ -101,6 +101,7 ＠＠
;; "8859-13.TXT"
("8859-14.TXT" latin-iso8859-14 #xA0 #xFF #x-80)
("8859-15.TXT" latin-iso8859-15 #xA0 #xFF #x-80)
+ ("8859-16.TXT" latin-iso8859-16 #xA0 #xFF #x-80)
("8859-2.TXT" latin-iso8859-2 #xA0 #xFF #x-80)
("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80)
("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80)
Index: lisp/mule/european.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/european.el,v
retrieving revision 1.9
diff -u -r1.9 european.el
--- lisp/mule/european.el 2002/06/04 06:04:29 1.9
+++ lisp/mule/european.el 2005/02/09 15:19:10
＠＠ -27,7 +27,7 ＠＠
;;; Commentary:
-;; For Europeans, six coded character sets ISO8859-1,2,3,4,9 are supported.
+;; For Europeans, seven coded character sets ISO8859-1,2,3,4,9,10 are supported.
;; Note: ISO 8859/15 (Latin-9) is supported via the latin-unity package.
;; #### latin.el would be a better name for this file.
＠＠ -131,6 +131,27 ＠＠
long-name "RHP of Latin-8 (ISO 8859-14)"
))
+(make-charset 'latin-iso8859-16
+ "Right-Hand Part of Latin Alphabet 10 (ISO/IEC 8859-16)"
+ '(dimension
+ 1
+ registry "ISO8859-16"
+ chars 96
+ columns 1
+ direction l2r
+ final ?f ; octet 06/06; cf ISO-IR 226
+ graphic 1
+ short-name "RHP of Latin-10"
+ long-name "RHP of Latin-10 (ISO 8859-16)"
+ ))
+
+(loop for c from 64 to 127
+ do (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w"))
+(mapc (lambda (c)
+ (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w"))
+ '(#xA1 #xA2 #xA3 #xA6 #xA8 #xAA #xAC #xAE #xAF
+ #xB3 #xB4 #xB5 #xB8 #xB9 #xBA #xBC #xBD #xBE #xBF))
+
;; For syntax of Latin-1 characters.
(loop for c from 64 to 127 ; from ',A＠(B' to ',A(B'
＠＠ -350,6 +371,15 ＠＠
charset-g3 t
mnemonic "MIME/Ltn-5"
))
+
+;; Add a coding system for ISO 8859-16.
+(make-coding-system
+ 'iso-8859-16 'iso2022 "MIME ISO-8859-16"
+ '(charset-g0 ascii
+ charset-g1 latin-iso8859-16
+ charset-g2 t ; grrr
+ charset-g3 t ; grrr
+ mnemonic "MIME/Ltn-10"))
(loop for ((charset codesys default-input nice-charset-1 nice-charset-2
supported-langs ;; a list if the doc string is replaced
--
“Ah come on now Ted, a Volkswagen with a mind of its own, driving all over
the place and going mad, if that’s not scary I don’t know what is.”
- 2 participants
- 2 comments
[COMMIT] Change Lisp representation of FcObjectSets
19 years, 2 months
Eric Knauel
Eric Knauel
NOTE: This patch has been committed.
APPROVE COMMIT sjt-xft
Simplify Fontconfig bindings part I: Representing FcObjectSets as a
new lrecord type has no advantages. This patch removes this lrecord
type.
2005-02-03 Eric Knauel <knauel(a)informatik.uni-tuebingen.de>
* fontconfig.el (fc-try-font):
(fc-find-available-font-families):
(fc-find-available-weights-for-family): adapt to new representation of
FcObjectSets
2005-02-03 Eric Knauel <eric(a)xemacs.org>
* lrecord.h (enum lrecord_type): remove lrecord for FcObjectSets
* xft-fonts.h (struct fc_fontset): remove lrecord for FcObjectSets
* xft-fonts.c (DEFINE_LRECORD_IMPLEMENTATION):
(Ffc_objectset_create, Ffc_objectset_p, Ffc_objectset_add)
(Ffc_objectset_destroy): remove lrecord for FcObjectSets
(Ffc_list_fonts_pattern_objects): adapt for new representation of
FcObjectSets
(string_list_to_fcobjectset): New utility function
XEmacs Xft branch source patch:
Diff command: cvs -q diff -u
Files affected: src/lrecord.h src/xft-fonts.h src/xft-fonts.c lisp/fontconfig.el
Index: lisp/fontconfig.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/Attic/fontconfig.el,v
retrieving revision 1.1.2.1
diff -u -p -u -r1.1.2.1 fontconfig.el
--- lisp/fontconfig.el 2004/11/25 12:44:01 1.1.2.1
+++ lisp/fontconfig.el 2005/02/04 15:56:43
＠＠ -268,26 +268,19 ＠＠ corresponding Xft font slant constant."
(add-finalizer pattern 'fc-pattern-destroy)
pattern))
-(defun make-fc-objectset ()
- "Make a Xft objectset record."
- (let ((objectset (fc-objectset-create)))
- (add-finalizer objectset 'fc-objectset-destroy)
- objectset))
-
(defun fc-try-font (font &optional device)
"Query for a font matching FONT on DEVICE.
FONT may be a fontconfig pattern object or a string (typically an XLFD).
Optional DEVICE is the device object to query, defaulting to the currently
selected device."
- (let ((objectset (make-fc-objectset))
- (device (or device (default-x-device)))
+ (let ((device (or device (default-x-device)))
(pattern (if (fc-pattern-p font)
font
(fc-name-parse font))))
(not (zerop
(fc-fontset-count
- (fc-list-fonts-pattern-objects device pattern objectset))))))
+ (fc-list-fonts-pattern-objects device pattern nil))))))
(defun fc-copy-pattern-partial (pattern attribute-list)
"Return a copy of PATTERN restricted to ATTRIBUTE-LIST.
＠＠ -320,13 +313,11 ＠＠ A new object is allocated and returned."
"Find all available font families."
(let ((device (or device (default-x-device)))
(pattern (make-fc-pattern))
- (objectset (make-fc-objectset)))
+ (objectset '("family" "style")))
; Xft2: does not work anymore
; (if (not fc-find-available-font-families-fc-fonts-only)
; (fc-pattern-add pattern fc-font-name-property-core t))
; (fc-objectset-add objectset fc-font-name-property-encoding)
- (fc-objectset-add objectset fc-font-name-property-family)
- (fc-objectset-add objectset fc-font-name-property-style)
(let* ((all-fonts
(fc-fontset-list
(fc-list-fonts-pattern-objects device pattern objectset))))
＠＠ -352,18 +343,17 ＠＠ A new object is allocated and returned."
"Find available weights for font FAMILY."
(let* ((device (or device (default-x-device)))
(pattern (make-fc-pattern))
- (objecset (make-fc-objectset)))
+ (objectset '("weight")))
(fc-pattern-add pattern fc-font-name-property-family family)
(if style
(fc-pattern-add pattern fc-font-name-property-style style))
- (fc-objectset-add objecset fc-font-name-property-weight)
(mapcar
'(lambda (pattern)
(let ((fc-weight-constant (fc-pattern-get-weight pattern 0)))
(if fc-weight-constant
(fc-font-weight-translate-from-constant fc-weight-constant))))
(fc-fontset-list
- (fc-list-fonts-pattern-objects device pattern objecset)))))
+ (fc-list-fonts-pattern-objects device pattern objectset)))))
;;; DELETE-DUPLICATES and REMOVE-DUPLICATES from cl-seq.el do not
;;; seem to work on list of strings...
Index: src/xft-fonts.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
retrieving revision 1.1.2.2
diff -u -p -u -r1.1.2.2 xft-fonts.c
--- src/xft-fonts.c 2004/12/03 07:41:09 1.1.2.2
+++ src/xft-fonts.c 2005/02/04 15:56:43
＠＠ -70,7 +70,6 ＠＠ int debug_xft = 1; /* This enables lots
Lisp_Object Qxft_font;
Lisp_Object Qfc_patternp; /* Do I really have to do this ??? */
-Lisp_Object Qfc_objectsetp;
Lisp_Object Qfc_fontsetp;
/* Lisp_Object Qfc_result_match; */ /* FcResultMatch */
Lisp_Object Qfc_result_type_mismatch; /* FcResultTypeMismatch */
＠＠ -92,15 +91,6 ＠＠ DEFINE_LRECORD_IMPLEMENTATION("fc-patter
fcpattern_description,
struct fc_pattern);
-static const struct memory_description fcobjset_description [] = {
- { XD_END }
-};
-
-DEFINE_LRECORD_IMPLEMENTATION("fc-objectset", fc_objectset,
- 0, 0, 0, 0, 0, 0,
- fcobjset_description,
- struct fc_objectset);
-
static const struct memory_description fcfontset_description [] = {
{ XD_END }
};
＠＠ -118,14 +108,6 ＠＠ Returns t if OBJECT is of type fc-patter
return FCPATTERNP(object) ? Qt : Qnil;
}
-DEFUN("fc-objectset-p", Ffc_objectset_p, 1, 1, 0, /*
-Returns t if OBJECT is of type fc-objectset, nil otherwise.
-*/
- (object))
-{
- return FCOBJECTSETP(object) ? Qt : Qnil;
-}
-
DEFUN("fc-fontset-p", Ffc_fontset_p, 1, 1, 0, /*
Returns t if OBJECT is of type fc-fontset, nil otherwise.
*/
＠＠ -761,69 +743,37 ＠＠ given pattern, or an error code. Poosib
return wrap_fcpattern(res_fcpat);
}
-DEFUN("fc-objectset-create", Ffc_objectset_create, 0, 0, 0, /*
-Create a fresh and empty fc object set object. */
- ())
-{
- struct fc_objectset *objset =
- alloc_lcrecord_type(struct fc_objectset, &lrecord_fc_objectset);
-
- objset->objsetPtr = FcObjectSetCreate();
- return wrap_fcobjset(objset);
-}
-
-DEFUN("fc-objectset-add", Ffc_objectset_add, 2, 2, 0, /*
-Add OBJECT (a string) to the fc object set FCOBJECTSET. Returns t on
-success, nil on failure. */
- (fcobjset, object))
-{
- Bool r;
-
- CHECK_FCOBJECTSET(fcobjset);
- CHECK_STRING(object);
-
- r = FcObjectSetAdd(XFCOBJECTSET_PTR(fcobjset),
- XSTRING_DATA(object));
- return r ? Qt : Qnil;
-}
-
-DEFUN("fc-objectset-destroy", Ffc_objectset_destroy, 1, 1, 0, /*
-Used internally to deallocate fc objectset objects. */
- (fcobjset))
-{
- CHECK_FCOBJECTSET(fcobjset);
- FcObjectSetDestroy(XFCOBJECTSET_PTR(fcobjset));
- return Qnil;
-}
-
DEFUN("fc-list-fonts-pattern-objects", Ffc_list_fonts_pattern_objects,
3, 3, 0, /*
List the fonts on DEVICE that match FCPAT for the properties in FCOBJSET.
DEVICE is an X11 device. FCPAT is a fontconfig pattern to be matched.
-FCOBJSET is a set of property names that should match.
+PROPERTIES is a list of property names (strings) that should match.
The result is a fontconfig fontset object. */
- (device, fcpat, fcobjset))
+ (device, fcpat, properties))
{
+ FcObjectSet *os;
struct fc_fontset *fontset =
- alloc_lcrecord_type(struct fc_fontset, &lrecord_fc_fontset);
+ alloc_lcrecord_type (struct fc_fontset, &lrecord_fc_fontset);
FcConfig *fcc;
- CHECK_FCPATTERN(fcpat);
- CHECK_FCOBJECTSET(fcobjset);
- if (NILP(device))
+ CHECK_FCPATTERN (fcpat);
+ CHECK_LIST (properties);
+
+ if (NILP (device))
return Qnil;
- CHECK_X_DEVICE(device);
- if (!DEVICE_LIVE_P(XDEVICE(device)))
+ CHECK_X_DEVICE (device);
+ if (!DEVICE_LIVE_P (XDEVICE (device)))
return Qnil;
- FcInit();
+ FcInit ();
fcc = FcConfigGetCurrent();
+ os = FcObjectSetCreate ();
+ string_list_to_fcobjectset (properties, os);
fontset->fontsetPtr =
- FcFontList(fcc,
- XFCPATTERN_PTR(fcpat),
- XFCOBJECTSET_PTR(fcobjset));
- return wrap_fcfontset(fontset);
+ FcFontList (fcc, XFCPATTERN_PTR (fcpat), os);
+ FcObjectSetDestroy (os);
+ return wrap_fcfontset (fontset);
}
DEFUN("fc-fontset-count", Ffc_fontset_count, 1, 1, 0, /*
＠＠ -1049,16 +999,26 ＠＠ xft_get_color (Display *dpy, Colormap cm
else
return xft_convert_color (dpy, cmap, visual, XINT (c), dim);
}
-
+
+static void
+string_list_to_fcobjectset (Lisp_Object list, FcObjectSet *os)
+{
+ Lisp_Object i;
+
+ for (i = list; !NILP (i); i = XCDR (i))
+ {
+ CHECK_STRING (XCAR (i));
+ FcObjectSetAdd (os, XSTRING_DATA (XCAR (i)));
+ }
+}
+
void
syms_of_xft_fonts (void)
{
INIT_LRECORD_IMPLEMENTATION(fc_pattern);
- INIT_LRECORD_IMPLEMENTATION(fc_objectset);
INIT_LRECORD_IMPLEMENTATION(fc_fontset);
DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_patternp);
- DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_objectsetp);
DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_fontsetp);
DEFSYMBOL(Qfc_result_type_mismatch);
＠＠ -1068,7 +1028,6 ＠＠ syms_of_xft_fonts (void)
DEFSYMBOL(Qxft_font);
DEFSUBR(Ffc_pattern_p);
- DEFSUBR(Ffc_objectset_p);
DEFSUBR(Ffc_fontset_p);
DEFSUBR(Ffc_pattern_create);
DEFSUBR(Ffc_name_parse);
＠＠ -1100,9 +1059,6 ＠＠ syms_of_xft_fonts (void)
DEFSUBR(Ffc_pattern_get_minspace);
#endif
DEFSUBR(Ffc_pattern_destroy);
- DEFSUBR(Ffc_objectset_create);
- DEFSUBR(Ffc_objectset_add);
- DEFSUBR(Ffc_objectset_destroy);
DEFSUBR(Ffc_list_fonts_pattern_objects);
DEFSUBR(Ffc_fontset_count);
DEFSUBR(Ffc_fontset_ref);
Index: src/xft-fonts.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.h,v
retrieving revision 1.1.2.2
diff -u -p -u -r1.1.2.2 xft-fonts.h
--- src/xft-fonts.h 2004/11/27 05:56:02 1.1.2.2
+++ src/xft-fonts.h 2005/02/04 15:56:43
＠＠ -69,22 +69,6 ＠＠ DECLARE_LRECORD(fc_pattern, struct fc_pa
#define XFCPATTERN_PTR(x) (XFCPATTERN(x)->fcpatPtr)
#define XFCPATTERN_FONTSET(x) (XFCPATTERN(x)->fontset)
-struct fc_objectset
-{
- struct lcrecord_header header;
- FcObjectSet *objsetPtr;
-};
-
-typedef struct fc_objectset fc_objectset;
-
-DECLARE_LRECORD(fc_objectset, struct fc_objectset);
-#define XFCOBJECTSET(x) XRECORD(x, fc_objectset, struct fc_objectset)
-#define wrap_fcobjset(p) wrap_record (p, fc_objectset)
-#define FCOBJECTSETP(x) RECORDP(x, fc_objectset)
-#define CHECK_FCOBJECTSET(x) CHECK_RECORD(x, fc_objectset)
-#define CONCHECK_FCOBJECTSET(x) CONCHECK_RECORD(x, fc_objectset)
-#define XFCOBJECTSET_PTR(x) (XFCOBJECTSET(x)->objsetPtr)
-
struct fc_fontset
{
struct lcrecord_header header;
＠＠ -105,5 +89,8 ＠＠ Lisp_Object fc_get_pattern_double(Lisp_O
Lisp_Object fc_get_pattern_integer(Lisp_Object fcpat, Lisp_Object id, const char* objid);
Lisp_Object fc_get_pattern_bool(Lisp_Object fcpat, Lisp_Object id, const char* objid);
Lisp_Object fc_get_pattern_string(Lisp_Object fcpat, Lisp_Object id, const char* objid);
+
+static void
+string_list_to_fcobjectset (Lisp_Object, FcObjectSet*);
#endif /* INCLUDED_xft_fonts_h_ */
Index: src/lrecord.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v
retrieving revision 1.34.2.1
diff -u -p -u -r1.34.2.1 lrecord.h
--- src/lrecord.h 2004/11/25 12:44:14 1.34.2.1
+++ src/lrecord.h 2005/02/04 15:56:43
＠＠ -221,7 +221,6 ＠＠ enum lrecord_type
lrecord_type_ratio,
lrecord_type_bigfloat,
lrecord_type_fc_pattern,
- lrecord_type_fc_objectset,
lrecord_type_fc_fontset,
lrecord_type_free, /* only used for "free" lrecords */
lrecord_type_undefined, /* only used for debugging */
-Eric
--
"Excuse me --- Di Du Du Duuuuh Di Dii --- Huh Weeeheeee" (Albert King)
- 3 participants
- 3 comments
[AC sjt-xft] configure.ac: Complex Option rewrite.
19 years, 2 months
Malcolm Purvis
Malcolm Purvis
APPROVE COMMIT
This is a rewrite of Stephen's complex option support for autoconf 2.5. I
feel that the API is a now lot simpler with the declaration of --with-xft
being:
XE_COMPLEX_ARG_WITH([xft],
[XE_COMPLEX_OPTION_HELP_STRING([--with-xft],
[Xft client-side font rendering and anti-aliasing],
[Xft],
[`emacs' (buffers), `menubars', `tabs', and `gauges'],
[X11, Xft, Xrender, freetype, and fontconfig],
[`emacs,menubars,tabs,gauges'])],
[],[],
[XE_COMPLEX_OPTION([emacs],[yes]),
XE_COMPLEX_OPTION([menubars],[yes]),
XE_COMPLEX_OPTION([tabs],[yes]),
XE_COMPLEX_OPTION([gauges],[yes])]
)
This patch also fixes all the bugs that I could find, adds
XE_COMPLEX_ARG_ENABLE for --enable- arguments and moves the runtime generation
of option lists to compile time.
ChangeLog addition:
2005-02-09 Malcolm Purvis <malcolmp(a)xemacs.org>
* configure.ac (XE_COMPLEX_OPTION):
* configure.ac (XE_COMPLEX_OPTION_HELP_STRING):
* configure.ac (XE_COMPLEX_ARG_WITH):
* configure.ac (XE_COMPLEX_ARG_ENABLE):
Rewritten complex option support with a simpler API and support
for --enable as well a --with.
xemacs-xft-bugfixes source patch:
Diff command: cvs -q diff -u
Files affected: configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.1.14.2
diff -u -r1.1.14.2 configure.ac
--- configure.ac 2005/02/02 06:06:58 1.1.14.2
+++ configure.ac 2005/02/09 03:11:28
＠＠ -233,30 +233,19 ＠＠
dnl For example, we might use "--with-xft=all,nomenubars" for compatibility
dnl with XFontSet i18n of menubars. (Silly, Xft looks much better than XFS.)
dnl Processing such an option requires a number of auxiliary variables.
-dnl Use the main variable name for a prefix, eg, "with_xft" for --with-xft.
-dnl Start by declaring it with XE_INIT_COMPLEX_OPTION (prefix), eg:
-dnl XE_INIT_COMPLEX_OPTION ([with_xft])
-dnl which also initializes auxiliary variables. For each possible value,
-dnl declare and intialize it with
-dnl XE_APPEND_COMPLEX_OPTION_DEFAULT (prefix, component, yesno), eg:
-dnl XE_APPEND_COMPLEX_OPTION_DEFAULT ([with_xft], [emacs], [yes])
-dnl This will create a variable named ${prefix}_${component}.
-dnl Next, use XE_PARSE_COMPLEX_OPTION(prefix, cmdline-option) in AC_ARG_WITH
-dnl to parse the value. After XE_PARSE_COMPLEX_OPTION is done, all the
-dnl component variables will have values. The variable $prefix will contain
-dnl the complex value assigned on the command line. Do any sanity-checking
-dnl now. Finally, use XE_CLEANUP_COMPLEX_OPTION(prefix) to clear out the
-dnl namespace of the auxiliary variables.
dnl
-dnl Probably a preferable API would look like
+dnl Complex options used an expanded forms of AC_ARG_[WITH|ENABLE] called
+dnl XE_COMPLEX_ARG_[WITH|ENABLE] both taking 5 parameters. The first 4
+dnl parameters of these macros are the same as original macros with the
+dnl exception that all four paramaters are REQUIRED. The ACTION-IF-TRUE code
+dnl is run after the argument list has been parsed.
dnl
-dnl XE_INIT_COMPLEX_OPTION([--with-xft])
-dnl XE_APPEND_COMPLEX_OPTION_DEFAULT([--with-xft],[tabs],[yes])
-dnl XE_PARSE_COMPLEX_OPTION([--with-xft])
-dnl XE_CLEANUP_COMPLEX_OPTION([--with-xft])
+dnl The 5th parameter is a list of XE_COMPLEX_OPTION macros that define the
+dnl valid components and their default values. The list must be quoted but
+dnl the individual macros should not.
dnl
-dnl The reason for suggesting the command-line flag is that there is already
-dnl a facility for converting it to the variable name somewhere in autoconf.
+dnl Option values are stored in the variables with_<package>_<component> or
+dnl enable_<feature>_<component> (eg with_xft_menubars)
dnl
dnl There are two possible uses in XEmacs for this kind of facility. One is
dnl exemplified by sound: there are alternative protocols (native, ESD, NAS)
＠＠ -266,52 +255,66 ＠＠
dnl during development of a feature. Perhaps specialized APIs should be
dnl provided, see comment on XE_COMPLEX_OPTION_HELP_STRING below.
-dnl XE_INIT_COMPLEX_OPTION(prefix)
-define([XE_INIT_COMPLEX_OPTION],[[$1]_default="" [$1]_types=""])
-
-dnl XE_CLEANUP_COMPLEX_OPTION(prefix)
-define([XE_CLEANUP_COMPLEX_OPTION],
-[# cleanup
-unset [$1]_bogus [$1]_found [$1]_notfirst [$1]_types
-unset [$1]_default [$1]_all_default x y])
+dnl XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno)
+dnl ---------------------------------------------------
+dnl
+dnl Internal macro create the option's shell variable containing the default
+dnl value and to note the values in an option list.
+dnl
+define([XE_EXPAND_COMPLEX_OPTION],
+[[$1]_[$2]=[$3]
+m4_append([XE_COMPONENT_LIST],[$2],[ ])
+dnl Separate with a ':' instead of a ',' (see <prefix>_default below) to avoid
+dnl confusion with marco parameter lists.
+m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:])
+])
-dnl #### This doesn't read so well for alternative libraries like sound.
-dnl #### Fucking autocrap. AC_HELP_STRING does some weird internal shit,
-dnl so if you quote the second arg with [], you get really bizarre output
-dnl from ./configure --help. Multiple quotes make it worse, and it matters
-dnl whether you define AC_HELP_STRING into XE_COMPLEX_OPTION_HELP_STRING, or
-dnl define XE_COMPLEX_OPTION_HELP_STRING to just do the string substitution
-dnl and invoke it inside of AC_HELP_STRING in the call to AC_ARG_WITH. But
-dnl St. IGNUble himself won't be able to help you if you put a comma into the
-dnl second arg to AC_HELP_STRING without the quotes; autocrap will shit its
-dnl pants. Yet it does fine if arguments to XE_COMPLEX_OPTION_HELP_STRING
-dnl contain commas!
+dnl XE_EXPAND_COMPLEX_OPTIONS(prefix, option_list)
+dnl ----------------------------------------------
dnl
-dnl XE_COMPLEX_OPTION_HELP_STRING(flag, long, short, components, libraries)
-define([XE_COMPLEX_OPTION_HELP_STRING],
-[AC_HELP_STRING([$1],Compile with support for [$2]. Components that can use
-[$3] are [$4]. Prefix component with `no' to disable its use of [$3]. Requires
-[$5] support. Default is [$6].)])
+dnl Internal macro to recursively expand all the options in the option list.
+dnl
+define([XE_EXPAND_COMPLEX_OPTIONS],
+[m4_if([$2], [[]], [],
+ [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl
+XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])])
-dnl XE_APPEND_COMPLEX_OPTION_DEFAULT(prefix, component, yesno)
-define([XE_APPEND_COMPLEX_OPTION_DEFAULT],
-[[$1]_[$2]=[$3]
-test -n "${[$1]_default}" && [$1]_default="${[$1]_default},"
-test "${[$1]_[$2]}" != "yes" && [$1]_default="${[$1]_default}no"
-[$1]_default="${[$1]_default}[$2]"
-[$1]_notfirst=""
-test -n "${[$1]_types}" && [$1]_types="${[$1]_types} "
-[$1]_types="${[$1]_types}[$2]"])
+dnl XE_INIT_COMPLEX_OPTION(prefix, option_list)
+dnl -------------------------------------------
+dnl
+dnl Internal macro to initialise the complex option shell variables.
+dnl Variables of the form <prefix>_<option> contain the default value for that
+dnl option. <prefix>_types contains a space-separated list of all the options
+dnl and <prefix>_default contains a comma-separated list of all the default
+dnl values.
+dnl
+define([XE_INIT_COMPLEX_OPTION],
+[[$1]_notfirst=""
+dnl
+XE_EXPAND_COMPLEX_OPTIONS($＠)
+[$1]_types="XE_COMPONENT_LIST"
+[$1]_default="m4_translit(XE_COMPONENT_DEFAULT,[:],[,])"
+dnl Undefine these macros so that they can be reused by later complex
+dnl options.
+undefine([XE_COMPONENT_LIST])
+undefine([XE_COMPONENT_DEFAULT])
+])
dnl XE_PARSE_COMPLEX_OPTION(prefix, cmdline-flag)
+dnl ---------------------------------------------
+dnl
+dnl Internal macro to parse the option values. If an undeclared option is
+dnl found then an error is generated.
+dnl
define([XE_PARSE_COMPLEX_OPTION],
-[for x in `echo "$withval" | sed -e 's/,/ /g'` ; do
+[for x in `echo "$[$1]" | sed -e 's/,/ /g'` ; do
[$1]_all_default=""
[$1]_found=""
case "$x" in
n | no | non | none ) [$1]_all_default=no ;;
a | al | all | both ) [$1]_all_default=yes ;;
esac
+
if test -z "$[$1]_all_default"; then
for y in $[$1]_types; do
dnl echo "testing x='$x' against y='$y'"
＠＠ -319,29 +322,79 ＠＠
dnl echo "$x" = "$y"
[$1]_found=yes
dnl echo eval `echo "[$1]_$y=yes"`
- eval `echo "[$1]_$y=yes"`
+ eval "[$1]_$y=yes"
elif test "$x" = "no$y"; then
dnl echo "$x" = "no$y"
[$1]_found=yes
dnl echo eval `echo "[$1]_$y=no"`
- eval `echo "[$1]_$y=no"`
+ eval "[$1]_$y=no"
fi
done
- test -z "[$1]_found" && [$1]_bogus=yes
+ test -z "$[$1]_found" && [$1]_bogus=yes
fi
if test "$[$1]_bogus" = "yes" -o \
\( -n "$[$1]_all_default" -a -n "$[$1]_notfirst" \) ; then
- USAGE_ERROR(["Valid values for the \`[$2]' option are:
+ USAGE_ERROR(["Valid values for the [$2] option are:
$[$1]_types. With prefix \"no\", switch it off.
Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: \`$[$1]_default'."])
+Hardcoded default is: $[$1]_default."])
elif test -n "$[$1]_all_default" ; then
- for y in "$[$1]_types"; do
- eval `echo "[$1]_$y="'$[$1]_all_default'`
+ for y in $[$1]_types; do
+ eval "[$1]_$y=$[$1]_all_default"
done
fi
[$1]_notfirst=yes
done
+unset [$1]_bogus [$1]_found [$1]_notfirst [$1]_types
+unset [$1]_default [$1]_all_default x y
+])
+
+dnl XE_COMPLEX_OPTION(option, yesno)
+dnl --------------------------------
+dnl
+dnl Declare a complex option and its default value. The value MUST be either
+dnl yes or no.
+dnl
+define([XE_COMPLEX_OPTION],[[$1,$2]])
+
+dnl XE_COMPLEX_OPTION_HELP_STRING(flag, long, short, components, libraries)
+dnl -----------------------------------------------------------------------
+dnl Boilerplate help string for complex options.
+dnl #### This doesn't read so well for alternative libraries like sound.
+dnl
+define([XE_COMPLEX_OPTION_HELP_STRING],
+[AC_HELP_STRING([$1],[Compile with support for $2. Components that can use
+$3 are $4. Prefix component with `no' to disable its use of $3. Requires
+$5 support. Default is $6.])])
+
+dnl XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
+dnl [XE_COMPLEX_OPTION(a,yes), ....])
+dnl --------------------------------------------------------------------------
+dnl
+dnl Expanded version of AC_ARG_WITH for complex options. All the parameters
+dnl are required.
+dnl
+define([XE_COMPLEX_ARG_WITH],
+[XE_INIT_COMPLEX_OPTION([with_]patsubst([$1], -, _), m4_shiftn(4, $＠))
+AC_ARG_WITH([$1],[$2],
+[XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1])
+$3
+],[$4])
+])
+
+dnl XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
+dnl [XE_COMPLEX_OPTION, ....])
+dnl --------------------------------------------------------------------------
+dnl
+dnl Expanded version of AC_ARG_ENABLE for complex options. All the parameters
+dnl are required.
+dnl
+define([XE_COMPLEX_ARG_ENABLE],
+[XE_INIT_COMPLEX_OPTION([enable_]patsubst([$1], -, _), m4_shiftn(4, $＠))
+AC_ARG_ENABLE([$1],[$2],
+[XE_PARSE_COMPLEX_OPTION([enable_]patsubst([$1], -, _), [--enable-$1])
+$3
+],[$4])
])
dnl -------------------------------------------------------------------------
＠＠ -439,25 +492,20 ＠＠
useful, for the same reason as JPEG images.]),
[], [])
-# Xft uses an option complex similar to sound and database
-XE_INIT_COMPLEX_OPTION([with_xft])
dnl if you change defaults, make sure to fix arg 6 of the OPTION_HELP macro.
-dnl these should really be enable_xft_*, but COMPLEX_OPTION support doesn't
-dnl grok that mixed with AC_ARG_WITH.
-XE_APPEND_COMPLEX_OPTION_DEFAULT([with_xft],[emacs],[yes])
-XE_APPEND_COMPLEX_OPTION_DEFAULT([with_xft],[menubars],[yes])
-XE_APPEND_COMPLEX_OPTION_DEFAULT([with_xft],[tabs],[yes])
-XE_APPEND_COMPLEX_OPTION_DEFAULT([with_xft],[gauges],[yes])
-dnl handle arguments
-AC_ARG_WITH([xft],
+XE_COMPLEX_ARG_WITH([xft],
[XE_COMPLEX_OPTION_HELP_STRING([--with-xft],
[Xft client-side font rendering and anti-aliasing],
[Xft],
[`emacs' (buffers), `menubars', `tabs', and `gauges'],
[X11, Xft, Xrender, freetype, and fontconfig],
[`emacs,menubars,tabs,gauges'])],
- [XE_PARSE_COMPLEX_OPTION([with_xft],[--with-xft])],
- [])
+ [],[],
+ [XE_COMPLEX_OPTION([emacs],[yes]),
+ XE_COMPLEX_OPTION([menubars],[yes]),
+ XE_COMPLEX_OPTION([tabs],[yes]),
+ XE_COMPLEX_OPTION([gauges],[yes])]
+)
dnl sanity checking
dnl #### Maybe we should XE_DIE here instead? Or fix the UI so that
dnl emacs is always implicit? (I worry that --without-xft would be weird.)
＠＠ -466,7 +514,6 ＠＠
AC_MSG_WARN([Forcing --with-xft=emacs because Xft is enabled])
with_xft_emacs=yes
fi
-XE_CLEANUP_COMPLEX_OPTION([with_xft])
# end of Xft parsing
AC_ARG_WITH([zlib],
AC_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]),
--
Malcolm Purvis <malcolmp(a)xemacs.org>
- 1 participants
- 0 comments
changes to spook.lines
19 years, 2 months
Manik Raina
Manik Raina
Good day, Do you accept changes to the file spook.lines ? We feel we
need to update this file, most of the stuff in there is from the cold
war era. If this is managed by someone else?
Manik
--
I confused things with their names: that is belief.
Jean-Paul Sartre
- 2 participants
- 1 comments
[COMMIT] Remove out-of-date doc files
19 years, 2 months
Ben Wing
Ben Wing
ChangeLog addition:
2005-02-03 Ben Wing <ben(a)xemacs.org>
* BUGS, README.packages: Delete, incorporate into FAQ.
* README: Incorporate into FAQ. Delete everything but text
pointing to FAQ.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: README
cvs server: Diffing .
cvs server: BUGS was removed, no comparison available
Index: README
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/README,v
retrieving revision 1.17
diff -u -p -r1.17 README
--- README 2002/08/20 06:31:26 1.17
+++ README 2005/02/04 03:01:54
＠＠ -1,245 +1,15 ＠＠
This directory tree holds version 21.5 of XEmacs.
+The information in this file has been superseded by the XEmacs FAQ.
-*** What is XEmacs?
+The easiest way to read the FAQ is to go to
-XEmacs is a powerful, highly customizable open source text editor and
-application development system, with full GUI support. It is protected
-under the GNU Public License and related to other versions of Emacs, in
-particular GNU Emacs. Its emphasis is on modern graphical user
-interface support and an open software development model, similar to
-Linux. XEmacs has an active development community numbering in the
-hundreds (and thousands of active beta testers on top of this), and runs
-on all versions of MS Windows, on Linux, and on nearly every other
-version of Unix in existence. Support for XEmacs has been supplied by
-Sun Microsystems, University of Illinois, Lucid, ETL/Electrotechnical
-Laboratory, Amdahl Corporation, BeOpen, and others, as well as the
-unpaid time of a great number of individual developers.
-
-
-
-*** What platforms does it run on?
-
- -- MS Windows (It has been tested on NT, 2000, 95, 98, and ME; you
- can also compile Cygwin and MinGW versions.)
- -- Unix (It is regularly tested on Linux, Solaris, SunOS, HP/UX,
- FreeBSD, OpenBSD, BSD/OS aka BSDI, Tru64 aka DEC/OSF, SCO5,
- and probably others. It should work on all versions of Unix
- created in the last 10 years or so, perhaps with a bit of
- work on more obscure platforms to correct bit-rot. It uses
- a sophisticated configuration system to auto-detect zillions
- of features that are implemented differently in different
- versions of Unix, so it will probably work on your vendor's
- version, possibly with a bit of tweaking, even if we've
- never heard of it.)
- -- MacOS/X (As an X Windows application. Unfortunately there is no
- support currently for MacOS-specific features.)
-
- There is also a port of XEmacs 19.14 (an older version, circa 1996)
- for all versions of MacOS, with extensive support for MacOS-specific
- features. See the FAQ for more details.
-
- There are rumors of an in-progress port to OS/2. See the FAQ.
-
- XEmacs will probably never work on MS/DOS or Windows 3.1, and we're
- not particularly interested in patches for these platforms, as they
- would introduce huge amounts of code clutter due to the woefully
- underfeatured nature of these systems. (See GNU Emacs for a port to
- MS/DOS.)
-
-
-
-*** Where's the FAQ?
-
-Look at `man/xemacs-faq.texi'.
-
-For the very latest version, see
-http://cvs.xemacs.org/cgi-bin/cvswebxe/xemacs/man/xemacs-faq.texi.
-
-
-
-*** Where's the latest version?
-
-For up-to-date information on XEmacs, see http://www.xemacs.org.
-
-To download XEmacs, see http://ftp.xemacs.org/ or
-ftp://ftp.xemacs.org/pub/xemacs/.
-
-For the latest experimental sources, see http://cvs.xemacs.org/, which
-gives instructions on how to get started with CVS access.
-
-There are numerous mailing lists for discussion of XEmacs. The
-current description of these lists can be found at
-http://www.xemacs.org/Lists/, or see `etc/MAILINGLISTS'. General
-discussion of bugs, new features, etc. takes place on
-xemacs-beta(a)xemacs.org.
-
-
-
-*** How do I build and install XEmacs?
-
-See the file `etc/NEWS' for information on new features and other
-user-visible changes since the last version of XEmacs.
-
-The file `INSTALL' in this directory says how to bring up XEmacs on
-Unix and Cygwin, once you have loaded the entire subtree of this
-directory.
-
-See the file `nt/README' for instructions on building XEmacs for
-Microsoft Windows.
-
-The file 'README.packages' will guide you in the installation of
-(essential) add on packages.
-
-
-
-*** How do I deal with bugs or with problems building, installing, or running?
-
-The file `PROBLEMS' contains information on many common problems that
-occur in building, installing and running XEmacs.
-
-Reports of bugs in XEmacs should be sent to xemacs-beta(a)xemacs.org.
-You can also post to the newsgroup comp.emacs.xemacs (or equivalentlt,
-send to the mailing list xemacs(a)xemacs.org), but it is less likely
-that the developers will see it in a timely fashion. See the "Bugs"
-section of the XEmacs manual for more information on how to report
-bugs. (The file `BUGS' in this directory explains how you can find
-and read that section using the Info files that come with XEmacs.)
-See `etc/MAILINGLISTS' for more information on mailing lists relating
-to XEmacs.
-
-
-*** How do I get started developing XEmacs?
-
-First, get yourself set up under CVS so that you can access the CVS
-repositories containing the XEmacs sources and the XEmacs packages.
-
-Next, set up your layout. This is important, as a good layout will
-facilitate getting things done efficiently, while a bad layout will could
-lead to disaster, as you can't figure out which code is the most recent,
-which can be thrown away, etc. We suggest the following layout: (feel free
-to make changes)
-
--- Everything goes under /src/xemacs (use a different directory if you
- want). From now, instead of saying /src/xemacs, we use <xsrc-top>, to
- make it easier in case someone picked a different directory.
-
--- Package source is in <xsrc-top>/package-src.
-
--- Installed packages go under <xsrc-top>/xemacs-packages, and
- <xsrc-top>/mule-packages.
-
--- A "workspace" is a complete copy of the sources, in which you do work of
- a particular kind. Workspaces can be differentiated by which branch of
- the source tree they extend off of -- usually either the stable or
- experimental, unless other branches have been created (for example, Ben
- created a branch for his Mule work because (1) the project was long-term
- and involved an enormous number of changes, (2) people wanted to be able
- to look at what his work in progress, and (3) he wanted to be able to
- check things in and in general use source-code control, since it was a
- long-term project). Workspaces are also differentiated in what their
- purpose is -- general working workspace, workspace for particular
- projects, workspace keeping the latest copy of the code in one of the
- branches without mods, etc.
-
--- Various workspaces are subdirectories under <xsrc-top>, e.g.:
-
- -- <xsrc-top>/working (the workspace you're actively working on,
- periodically synched up with the latest trunk)
-
- -- <xsrc-top>/stable (for making changes to the stable version of
- XEmacs, which sits on a branch)
-
- -- <xsrc-top>/unsigned-removal (a workspace for a specific, difficult
- task that's going to affect lots of source and take a long time, and
- so best done in its own workspace without the interference of other
- work you're doing. Also, you can commit just this one large change,
- separate from all the other changes).
-
- -- <xsrc-top>/latest (a copy of the latest sources on the trunk,
- i.e. the experimental version of XEmacs, with no patches in it;
- either update it periodically, by hand, or set up a cron job to do it
- automatically). Set it up so it can be built, and build it so you
- have a working XEmacs. (Building it might also go into the cron job.)
-
- This workspace serves a number of purposes:
- -- 1. You always have a recent version of XEmacs you can compare
- against when something you're working on breaks. It's true
- that you can do this with cvs diff, but when you need to do
- some serious investigation, this method just fails.
- -- 2. You (almost) always have a working, up-to-date executable that
- can be used when your executable is crashing and you need to
- keep developing it, or when you need an `xemacs' to build
- packages, etc.
- -- 3. When creating new workspaces, you can just copy the `latest'
- workspace using GNU cp -a. You have all the .elc's built,
- everything else probably configured, any spare files in place
- (e.g. some annoying xpm.dll under Windows, etc.).
-
- -- <xsrc-top>/latest-stable/ (equivalent to <xsrc-top>/latest/, but
- for the Stable branch of XEmacs, rather than the Experimental branch
- of XEmacs). This may or may not be necessary depending on how much
- development you do of the stable branch.
-
--- <xsrc-top>/xemacsweb is a workspace for working on the XEmacs web site.
-
--- <xsrc-top>/in-patches for patches received from email and saved to files.
-
--- <xsrc-top>/out-patches for locally-generated patches to be sent to
- xemacs-patches(a)xemacs.org. Less useful now that the patcher util has been
- developed.
-
--- <xsrc-top>/build, for build trees when compiling and testing XEmacs with
- various configuration options turned off and on. The scripts in
- xemacs-builds/ben (see below) can be used to automate building XEmacs
- workspaces with many different configuration options and automatically
- filtering out the normal output so that you see only the abnormal
- output.
-
--- <xsrc-top>/xemacs-builds, for the xemacs-builds module, which you need
- to check out separately in CVS. This contains scripts used for building
- XEmacs, automating and simplifying using CVS, etc. Under various
- people's directories are their own build and other scripts. The
- currently most-maintained scripts are under ben/, where there are easily
- configurable scripts that can be used to easily build any workspace
- (esp. if you've more or less followed the layout presented above)
- unattended, with one or more configuration states (there's a
- pre-determined list of the most useful, but it's easy to change). The
- output is filtered and split up in various ways so that you can identify
- which output came from where, and you can see the output either full or
- with all "normal" output except occasional status messages filtered so
- that you only see the abnormal ones.
-
-*** What's the basic layout of the code?
-
-The file `configure' is a shell script to acclimate XEmacs to the
-oddities of your processor and operating system. It will create a
-file named `Makefile' (a script for the `make' program), which helps
-automate the process of building and installing emacs. See INSTALL
-for more detailed information.
-
-The file `configure.in' is the input used by the autoconf program to
-construct the `configure' script. Since XEmacs has configuration
-requirements that autoconf can't meet, `configure.in' uses an unholy
-marriage of custom-baked configuration code and autoconf macros; it
-may be wise to avoid rebuilding `configure' from `configure.in' when
-possible.
-
-The file `Makefile.in' is a template used by `configure' to create
-`Makefile'.
-
-There are several subdirectories:
-
-`src' holds the C code for XEmacs (the XEmacs Lisp interpreter and its
- primitives, the redisplay code, and some basic editing functions).
-`lisp' holds the XEmacs Lisp code for XEmacs (most everything else).
-`lib-src' holds the source code for some utility programs for use by
- or with XEmacs, like movemail and etags.
-`etc' holds miscellaneous architecture-independent data files
- XEmacs uses, like the tutorial text and the Zippy the Pinhead quote
- database. The contents of the `lisp', `info' and `man'
- subdirectories are architecture-independent too.
-`lwlib' holds the C code for the X toolkit objects used by XEmacs.
-`info' holds the Info documentation tree for XEmacs.
-`man' holds the source code for the XEmacs online documentation.
-`nt' holds files used compiling XEmacs under Microsoft Windows.
+http://www.xemacs.org/Documentation/21.5/html/xemacs-faq_1.html
+
+You can also the local copy of the FAQ inside XEmacs by using
+use Help->XEmacs FAQ from the menu, or `C-h F'.
+
+If you don't have XEmacs running and can't access the web,
+look directly at `man/xemacs-faq.texi' or `info/xemacs-faq.info'.
+
+
cvs server: README.packages was removed, no comparison available
- 3 participants
- 3 comments
[PATCH] Bind manual-entry to C-h C-m
19 years, 2 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed. Cf. discussion in
16860.42135.703800.617756(a)parhasard.net and
002101c50366$ed128a90$220110ac＠neeeeeee2 (from Ben, to xemacs-beta, didn't
reach there, reached me, Stephen was CCed.)
xemacs-packages/edit-utils/ChangeLog addition:
2005-02-09 Aidan Kehoe <kehoea(a)parhasard.net>
* man.el: Bind manual-entry to C-h C-m by default.
Index: man.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/man.el,v
retrieving revision 1.17
diff -u -r1.17 man.el
--- man.el 2004/04/25 10:30:27 1.17
+++ man.el 2005/02/08 23:23:37
＠＠ -305,6 +305,9 ＠＠
(message nil)
buffer))
+;;;###autoload
+(define-key help-map "\C-m" 'manual-entry)
+
(defun Manual-mode ()
(kill-all-local-variables)
(setq buffer-read-only t)
--
“Ah come on now Ted, a Volkswagen with a mind of its own, driving all over
the place and going mad, if that’s not scary I don’t know what is.”
- 1 participants
- 0 comments
[PATCH] Make Mule-UCS, latin-unity depend on latin-euro-standards.
19 years, 2 months
Aidan Kehoe
Aidan Kehoe
This patch follows up to the previous one, and makes Mule-UCS depend on the
refactored latin-euro-standards. This is the sanest way to make Mule-UCS
work with the recent ISO 8859 8-bit standards out of the box.
NOTE THE BELOW PATCH IS INCOMPLETE. THE ATTACHED .bz2 FILE CONTAINS THE FULL
PATCH, WHICH CONTAINS ISO-2022-ENCODED FILES THAT THE COMBINATION OF MY
MAILER AND YOUR MAILER WILL BREAK.
ChangeLog addition:
mule-packages/latin-unity/ChangeLog addition:
2005-02-08 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile: Update version, requires, preloads.
* latin-unity-latin7.el (iso8859/13-case-table): Removed.
* latin-unity-latin10.el:
* latin-unity-latin7.el:
* latin-unity-latin8.el:
* latin-unity-latin9.el:
Refactor out functionality, add asserts to make sure the old
functionality is provided by latin-euro-standards.
* latin-unity-vars.el:
Depend on latin-euro-standards instead of latin-unity-latin*.
* latin-unity.el:
Depend on latin-unity-vars to load latin{7,8,9,10} language
environment.
* latin-unity.texi (Interfaces): Update doc to reflect refactoring.
mule-packages/mule-ucs/ChangeLog addition:
2005-02-08 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile: Make the package depend on latin-euro-standards,
increment the Makefile version.
mule-packages/mule-ucs/lisp/ChangeLog addition:
2005-02-08 Aidan Kehoe <kehoea(a)parhasard.net>
* un-define.el:
Require latin-euro-standards to initialise the latin{7,8,9,10}
character sets.
* un-trbase.el (unicode-charset-library-alist):
Add translation rules for the latin{7,10} Mule character sets. (-8
and -9 were already there, but not be
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: mule-packages/mule-ucs/lisp/un-trbase.el mule-packages/mule-ucs/lisp/un-define.el mule-packages/mule-ucs/Makefile mule-packages/mule-ucs/lisp/reldata/uiso8859-13.el mule-packages/mule-ucs/lisp/reldata/uiso8859-16.el mule-packages/latin-unity/latin-unity.texi mule-packages/latin-unity/latin-unity.el mule-packages/latin-unity/latin-unity-vars.el mule-packages/latin-unity/latin-unity-latin9.el mule-packages/latin-unity/latin-unity-latin8.el mule-packages/latin-unity/latin-unity-latin7.el mule-packages/latin-unity/latin-unity-latin10.el mule-packages/latin-unity/Makefile
Index: mule-packages/latin-unity/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- mule-packages/latin-unity/Makefile 2004/05/14 12:51:28 1.31
+++ mule-packages/latin-unity/Makefile 2005/02/08 22:17:24
＠＠ -1,6 +1,6 ＠＠
# Makefile for latin-unity
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005 Free Software Foundation, Inc.
# This file is part of XEmacs.
＠＠ -19,10 +19,10 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# Last-modified: 2002 October 24
+# Last-modified: 2005 February 7
# The XEmacs CVS version is canonical. Keep versions n'sync.
-VERSION = 1.10
+VERSION = 1.11
AUTHOR_VERSION = $(VERSION)
MAINTAINER = Stephen J. Turnbull <stephen(a)xemacs.org>
PACKAGE = latin-unity
＠＠ -31,9 +31,9 ＠＠
# The Mule-UCS, leim, and fsf-compat requires will go away at some point
ifeq ($(wildcard ../mule-ucs),)
-REQUIRES = mule-base leim fsf-compat dired
+REQUIRES = mule-base latin-euro-standards leim fsf-compat dired
else
-REQUIRES = mule-base mule-ucs leim fsf-compat dired
+REQUIRES = mule-base latin-euro-standards mule-ucs leim fsf-compat dired
endif
# Latin-Unity is a unique package in that it does not compile or run
＠＠ -50,11 +50,12 ＠＠
latin-unity-latin8.elc latin-unity-latin10.elc \
latin-unity-utils.elc
+
EXTRA_SOURCES = latin-unity-tests.el latin-unity-tables.el
# for defvars and creation of ISO 8859/13 and ISO 8859/15 charsets and
# coding system
-PRELOADS=-l cl-macs -l latin-unity-latin7.el -l latin-unity-latin9.el \
+PRELOADS=-l cl-macs \
-l latin-unity-vars.el
STANDARD_DOCS = t
Index: mule-packages/latin-unity/latin-unity-latin10.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin10.el,v
retrieving revision 1.1
diff -u -r1.1 latin-unity-latin10.el
--- mule-packages/latin-unity/latin-unity-latin10.el 2002/10/24 19:21:08 1.1
+++ mule-packages/latin-unity/latin-unity-latin10.el 2005/02/08 22:17:24
＠＠ -5,6 +5,7 ＠＠
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 October 24
+;; Last-Modified: 2005 February 7
;; This file is part of XEmacs.
＠＠ -36,76 +37,26 ＠＠
;;; Code:
-;; define ISO-8859-16 for XEmacs 21.4 and earlier
-;;;###autoload
-(unless (find-charset 'latin-iso8859-16)
- ;; Create character set
- (make-charset
- 'latin-iso8859-16 "ISO8859-16 (Latin 10)"
- ;; sheesh, what we do for backward compatibility
- ;; #### this test and the similar one below probably should be
- ;; reformulated to use condition-case
- (append (if (emacs-version>= 21 4)
- '(short-name "Latin-10"
- long-name "ISO8859-16 (Latin 10)")
- nil)
- '(registry "iso8859-16"
- dimension 1
- columns 1
- chars 96
- final ?f ; octet 06/06; cf ISO-IR 226
- graphic 1
- direction l2r)))
- ;; For syntax of Latin-10 characters.
- (require 'cl)
- (load "cl-macs" nil t)
- (loop for c from 64 to 127
- do (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w"))
- (mapc (lambda (c)
- (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w"))
- '(#xA1 #xA2 #xA3 #xA6 #xA8 #xAA #xAC #xAE #xAF
- #xB3 #xB4 #xB5 #xB8 #xB9 #xBA #xBC #xBD #xBE #xBF))
- )
-
-;;;###autoload
-(unless (find-coding-system 'iso-8859-16)
- ;; Create coding system
- (make-coding-system
- 'iso-8859-16 'iso2022 "MIME ISO-8859-16"
- '(charset-g0 ascii
- charset-g1 latin-iso8859-16
- charset-g2 t ; grrr
- charset-g3 t ; grrr
- mnemonic "MIME/Ltn-10")))
-
-;;;###autoload
-(unless (assoc "Latin-10" language-info-alist)
- (defun setup-latin10-environment ()
- "Set up multilingual environment (MULE) for European Latin-10 users."
- (interactive)
- (set-language-environment "Latin-10"))
-
- ;; sheesh, what we do for backward compatibility
- (apply #'set-language-info-alist
- (append `("Latin-10"
- ((charset ascii latin-iso8859-16)
- (coding-system iso-8859-16)
- (coding-priority iso-8859-16)
- (input-method . "latin-10-prefix")
- (sample-text
- .
- ;; #### OK, who knows some Romanian?
- ,(format "\
-Hey, if you know Romanian, send sample encoded text (eg, using \"comma-below\"
-characters) to xemacs-beta(a)xemacs.org. Please use a MIME
-application/octet-stream attachment if possible."
- ))
- (documentation . "\
-This is a generic language environment for Latin-10 (ISO-8859-16). It
-supports Romanian and most Western European languages.")))
- (if (emacs-version>= 21 1 15)
- '(("European"))
- nil))))
+;;; Actual functionality has been moved to the latin-euro-standards package,
+;;; to prevent a circular dependency for Mule-UCS. This is a compatibility
+;;; stub. -- Aidan Kehoe, Mon Feb 7 20:18:03 CET 2005
+
+(require 'latin-euro-standards)
+
+;; Check that we're functionally equivalent to the old latin-unity-latin10.el
+
+;; The character set should exist.
+(assert (charsetp (find-charset 'latin-iso8859-16))
+ "`latin-euro-standards' didn't provide a Latin 10 character set!")
+
+;; As should the coding system.
+(assert (coding-system-p (find-coding-system 'iso-8859-16))
+ "`latin-euro-standards' didn't provide a Latin 10 coding system!")
+
+;; And we should have a language environment.
+(assert
+ (assoc "Latin-10" language-info-alist)
+ "`latin-euro-standards' didn't provide a Latin 10 language environment!")
(provide 'latin-unity-latin10)
Index: mule-packages/latin-unity/latin-unity-latin7.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin7.el,v
retrieving revision 1.1
diff -u -r1.1 latin-unity-latin7.el
--- mule-packages/latin-unity/latin-unity-latin7.el 2002/10/24 19:21:09 1.1
+++ mule-packages/latin-unity/latin-unity-latin7.el 2005/02/08 22:17:25
＠＠ -5,7 +5,7 ＠＠
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 March 7
-;; Last-modified: 2002 March 23
+;; Last-modified: 2005 February 7
;; This file is part of XEmacs.
＠＠ -37,99 +37,26 ＠＠
;;; Code:
-;; define ISO-8859-13 for XEmacs 21.4 and earlier
-; don't ;;;###autoload
-(unless (find-charset 'latin-iso8859-13)
- ;; Create character set
- (make-charset
- 'latin-iso8859-13 "ISO8859-13 (Latin 7)"
- ;; sheesh, what we do for backward compatibility
- ;; #### this test and the similar one below probably should be
- ;; reformulated to use condition-case
- (append (if (emacs-version>= 21 4)
- '(short-name "Latin-7"
- long-name "ISO8859-13 (Latin 7)")
- nil)
- '(registry "iso8859-13"
- dimension 1
- columns 1
- chars 96
- final ?Y
- graphic 1
- direction l2r)))
- ;; For syntax of Latin-7 characters.
- (require 'cl)
- (load "cl-macs" nil t) ; howcum no #'provide?
- (loop for c from 64 to 127 ; from 'À' to 'ÿ'
- do (modify-syntax-entry (make-char 'latin-iso8859-13 c) "w"))
- (mapc (lambda (c)
- (modify-syntax-entry (make-char 'latin-iso8859-13 c) "w"))
- '(#xA8 #xAA #xAF #xB8 #xBA #xBF))
-
- (modify-syntax-entry (make-char 'latin-iso8859-13 32) "w") ; no-break space
- (modify-syntax-entry (make-char 'latin-iso8859-13 87) "_") ; multiply
- (modify-syntax-entry (make-char 'latin-iso8859-13 119) "_") ; divide
- (modify-syntax-entry (make-char 'latin-iso8859-13 127) ".") ; right squote
- )
-
-(defvar iso8859/13-case-table
- (let ((table (copy-case-table (standard-case-table))))
- (mapc (lambda (pair)
- (put-case-table-pair (make-char 'latin-iso8859-13 (car pair))
- (make-char 'latin-iso8859-13 (cdr pair))
- table))
- '((#xA8 . #xB8) (#xAA . #xBA) (#xAF . #xBF)))
- (let ((i #xC0))
- (while (< i #xDF)
- (unless (= i #xD7)
- (put-case-table-pair (make-char 'latin-iso8859-13 i)
- (make-char 'latin-iso8859-13 (+ i #x20))
- table))
- (setq i (1+ i))))
- table)
- "Case table for Latin 7, right half of ISO 8859/13.")
-
-; don't ;;;###autoload
-(unless (find-coding-system 'iso-8859-13)
- ;; Create coding system
- (make-coding-system
- 'iso-8859-13 'iso2022 "MIME ISO-8859-13"
- '(charset-g0 ascii
- charset-g1 latin-iso8859-13
- charset-g2 t ; grrr
- charset-g3 t ; grrr
- mnemonic "MIME/Ltn-7")))
-
-; don't ;;;###autoload
-(unless (assoc "Latin-7" language-info-alist)
- (defun setup-latin7-environment ()
- "Set up multilingual environment (MULE) for Baltic Rim Latin-7 users."
- (interactive)
- (set-language-environment "Latin-7"))
-
- ;; sheesh, what we do for backward compatibility
- (apply #'set-language-info-alist
- (append `("Latin-7"
- ((charset ascii latin-iso8859-13)
- (coding-system iso-8859-13)
- (coding-priority iso-8859-13)
- (input-method . "latin-7-prefix")
- (sample-text
- .
- ,(format "\
-Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!"
- ;; SMALL U WITH UMLAUT
- (make-char 'latin-iso8859-13 #x7C)
- ;; GERMAN SHARP S
- (make-char 'latin-iso8859-13 #x5F)
- ;; INVERTED EXCLAMATION MARK
- (make-char 'latin-iso8859-13 #x21)))
- (documentation . "\
-This is a generic language environment for Latin-7 (ISO-8859-13). It
-supports the Baltic Rim languages.")))
- (if (emacs-version>= 21 1 15)
- '(("Baltic Rim"))
- nil))))
+;;; Actual functionality has been moved to the latin-euro-standards package,
+;;; to prevent a circular dependency for Mule-UCS. This is a compatibility
+;;; stub. -- Aidan Kehoe, Mon Feb 7 20:18:03 CET 2005
+
+(require 'latin-euro-standards)
+
+;; Check that we're functionally equivalent to the old latin-unity-latin7.el
+
+;; The character set should exist.
+(assert (charsetp (find-charset 'latin-iso8859-13))
+ "`latin-euro-standards' didn't provide a Latin 7 character set!")
+
+;; As should the coding system.
+(assert (coding-system-p (find-coding-system 'iso-8859-13))
+ "`latin-euro-standards' didn't provide a Latin 7 coding system!")
+
+;; And we should have a language environment.
+(assert
+ (assoc "Latin-7" language-info-alist)
+ "`latin-euro-standards' didn't provide a Latin 7 language environment!")
(provide 'latin-unity-latin7)
Index: mule-packages/latin-unity/latin-unity-latin8.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin8.el,v
retrieving revision 1.1
diff -u -r1.1 latin-unity-latin8.el
--- mule-packages/latin-unity/latin-unity-latin8.el 2002/10/24 19:21:09 1.1
+++ mule-packages/latin-unity/latin-unity-latin8.el 2005/02/08 22:17:25
＠＠ -5,6 +5,7 ＠＠
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 October 24
+;; Last-Modified: 2005 February 7
;; This file is part of XEmacs.
＠＠ -36,75 +37,26 ＠＠
;;; Code:
-;; define ISO-8859-14 for XEmacs 21.4 and earlier
-;;;###autoload
-(unless (find-charset 'latin-iso8859-14)
- ;; Create character set
- (make-charset
- 'latin-iso8859-14 "ISO8859-14 (Latin 8)"
- ;; sheesh, what we do for backward compatibility
- ;; #### this test and the similar one below probably should be
- ;; reformulated to use condition-case
- (append (if (emacs-version>= 21 4)
- '(short-name "Latin-8"
- long-name "ISO8859-16 (Latin 8)")
- nil)
- '(registry "iso8859-14"
- dimension 1
- columns 1
- chars 96
- final ?_ ; octet 05/15; cf ISO-IR 199
- graphic 1
- direction l2r)))
- ;; For syntax of Latin-8 characters.
- (require 'cl)
- (load "cl-macs" nil t)
- (loop for c from 32 to 127
- do (modify-syntax-entry (make-char 'latin-iso8859-14 c) "w"))
- (mapc (lambda (c)
- (modify-syntax-entry (make-char 'latin-iso8859-14 c) "_"))
- '(#xA3 #xA7 #xA9 #xAD #xAE #xB6))
- )
-
-;;;###autoload
-(unless (find-coding-system 'iso-8859-14)
- ;; Create coding system
- (make-coding-system
- 'iso-8859-14 'iso2022 "MIME ISO-8859-14"
- '(charset-g0 ascii
- charset-g1 latin-iso8859-14
- charset-g2 t ; grrr
- charset-g3 t ; grrr
- mnemonic "MIME/Ltn-8")))
-
-;;;###autoload
-(unless (assoc "Latin-8" language-info-alist)
- (defun setup-latin8-environment ()
- "Set up multilingual environment (MULE) for European Latin-8 users."
- (interactive)
- (set-language-environment "Latin-8"))
-
- ;; sheesh, what we do for backward compatibility
- (apply #'set-language-info-alist
- (append `("Latin-8"
- ((charset ascii latin-iso8859-14)
- (coding-system iso-8859-14)
- (coding-priority iso-8859-14)
- (input-method . "latin-8-prefix")
- (sample-text
- .
- ;; #### OK, who knows some Gaelic?
- ,(format "\
-Hey, if you know a Celtic language, send sample encoded text (eg, using
-\"dot-above\" characters) to xemacs-beta(a)xemacs.org. Please use a MIME
-application/octet-stream attachment if possible."
- ))
- (documentation . "\
-This is a generic language environment for Latin-8 (ISO-8859-14). It
-supports Celtic and most Western European languages.")))
- (if (emacs-version>= 21 1 15)
- '(("European"))
- nil))))
+;;; Actual functionality has been moved to the latin-euro-standards package,
+;;; to prevent a circular dependency for Mule-UCS. This is a compatibility
+;;; stub. -- Aidan Kehoe, Mon Feb 7 20:18:03 CET 2005
+
+(require 'latin-euro-standards)
+
+;; Check that we're functionally equivalent to the old latin-unity-latin8.el
+
+;; The character set should exist.
+(assert (charsetp (find-charset 'latin-iso8859-14))
+ "`latin-euro-standards' didn't provide a Latin 8 character set!")
+
+;; As should the coding system.
+(assert (coding-system-p (find-coding-system 'iso-8859-14))
+ "`latin-euro-standards' didn't provide a Latin 8 coding system!")
+
+;; And we should have a language environment.
+(assert
+ (assoc "Latin-8" language-info-alist)
+ "`latin-euro-standards' didn't provide a Latin 8 language environment!")
(provide 'latin-unity-latin8)
Index: mule-packages/latin-unity/latin-unity-latin9.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin9.el,v
retrieving revision 1.6
diff -u -r1.6 latin-unity-latin9.el
--- mule-packages/latin-unity/latin-unity-latin9.el 2004/05/14 08:12:40 1.6
+++ mule-packages/latin-unity/latin-unity-latin9.el 2005/02/08 22:17:25
＠＠ -37,107 +37,26 ＠＠
;;; Code:
-;; define ISO-8859-15 for XEmacs 21.4 and earlier
-;;;###autoload
-(unless (find-charset 'latin-iso8859-15)
- ;; Create character set
- (make-charset
- 'latin-iso8859-15 "ISO8859-15 (Latin 9)"
- ;; sheesh, what we do for backward compatibility
- ;; #### this test and the similar one below probably should be
- ;; reformulated to use condition-case
- (append (if (emacs-version>= 21 4)
- '(short-name "Latin-9"
- long-name "ISO8859-15 (Latin 9)")
- nil)
- '(registry "iso8859-15"
- dimension 1
- columns 1
- chars 96
- final ?b
- graphic 1
- direction l2r)))
- ;; For syntax of Latin-9 characters.
- (require 'cl)
- (load "cl-macs" nil t) ; howcum no #'provide?
- (loop for c from 64 to 127 ; from 'À' to 'ÿ'
- do (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w"))
- (mapc (lambda (c)
- (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w"))
- '(#xA6 #xA8 #xB4 #xB8 #xBC #xBD #xBE))
-
- (modify-syntax-entry (make-char 'latin-iso8859-15 32) "w") ; no-break space
- (modify-syntax-entry (make-char 'latin-iso8859-15 87) "_") ; multiply
- (modify-syntax-entry (make-char 'latin-iso8859-15 119) "_") ; divide
- )
-
-;;;###autoload
-(unless (find-coding-system 'iso-8859-15)
- ;; Create coding system
- (make-coding-system
- 'iso-8859-15 'iso2022 "MIME ISO-8859-15"
- '(charset-g0 ascii
- charset-g1 latin-iso8859-15
- charset-g2 t ; grrr
- charset-g3 t ; grrr
- mnemonic "MIME/Ltn-9")))
-
-;;;###autoload
-(unless (assoc "Latin-9" language-info-alist)
- (defun setup-latin9-environment ()
- "Set up multilingual environment (MULE) for European Latin-9 users."
- (interactive)
- (set-language-environment "Latin-9"))
-
- ;; sheesh, what we do for backward compatibility
- (apply #'set-language-info-alist
- (append `("Latin-9"
- ((charset ascii latin-iso8859-15)
- (coding-system iso-8859-15)
- (coding-priority iso-8859-15)
- (input-method . "latin-9-prefix")
- (sample-text
- .
- ,(format "\
-Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!, my %c0.02"
- ;; SMALL U WITH UMLAUT
- (make-char 'latin-iso8859-15 #x7C)
- ;; GERMAN SHARP S
- (make-char 'latin-iso8859-15 #x5F)
- ;; INVERTED EXCLAMATION MARK
- (make-char 'latin-iso8859-15 #x21)
- ;; EURO SIGN
- (make-char 'latin-iso8859-15 #x24)))
- (documentation . "\
-This is a generic language environment for Latin-9 (ISO-8859-15). It
-supports the Euro and the following languages:
- Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
- Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish.
-We also have a German specific language environment \"German\".")))
- (if (emacs-version>= 21 1 15)
- '(("European"))
- nil))))
-
-;; #### move these to a separate file for keysyms.
-;; I think these are all the ones not in Latin-1.
-
-;;;###autoload
-(flet ((define-keysym-as-char (keysym character)
- (unless (lookup-key global-map (vector keysym))
- (define-key global-map (vector keysym) #'self-insert-command))
- (unless (get keysym 'ascii-character)
- (put keysym 'ascii-character character)))
- (foo (k o)
- (define-keysym-as-char k (make-char 'latin-iso8859-15 o))))
- (foo 'EuroSign #x24)
- (foo 'Scaron #x26)
- (foo 'scaron #x28)
- (foo 'Zcaron #x34)
- (foo 'zcaron #x38)
- (foo 'OE #x3C)
- (foo 'oe #x3D)
- (foo 'Ydiaeresis #x3E))
-
+;;; Actual functionality has been moved to the latin-euro-standards package,
+;;; to prevent a circular dependency for Mule-UCS. This is a compatibility
+;;; stub. -- Aidan Kehoe, Mon Feb 7 20:18:03 CET 2005
+
+(require 'latin-euro-standards)
+
+;; Check that we're functionally equivalent to the old latin-unity-latin9.el
+
+;; The character set should exist.
+(assert (charsetp (find-charset 'latin-iso8859-16))
+ "`latin-euro-standards' didn't provide a Latin 9 character set!")
+
+;; As should the coding system.
+(assert (coding-system-p (find-coding-system 'iso-8859-15))
+ "`latin-euro-standards' didn't provide a Latin 9 coding system!")
+
+;; And we should have a language environment.
+(assert
+ (assoc "Latin-9" language-info-alist)
+ "`latin-euro-standards' didn't provide a Latin 9 language environment!")
(provide 'latin-unity-latin9)
Index: mule-packages/latin-unity/latin-unity-vars.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-vars.el,v
retrieving revision 1.5
diff -u -r1.5 latin-unity-vars.el
--- mule-packages/latin-unity/latin-unity-vars.el 2002/10/24 19:21:16 1.5
+++ mule-packages/latin-unity/latin-unity-vars.el 2005/02/08 22:17:25
＠＠ -37,24 +37,9 ＠＠
(provide 'latin-unity-vars)
-;; If you consider any of these bloat, you can comment them out, but
-;; YOU MUST REGENERATE latin-unity-tables.el. The table and the code
-;; depend on arbitrarily chosen indexes for the charsets.
-
-;; Latin-7 charset, ISO 8859/13 coding system, Latin-7 environment (Baltic Rim)
-;; Few people will need this, but it avoids screwups.
-(require 'latin-unity-latin7)
-
-;; Latin-8 charset, ISO 8859/14 coding system, Latin-8 environment (Celtic)
-;; Few people will need this, but it avoids screwups.
-(require 'latin-unity-latin8)
-
-;; Latin-9 charset, ISO 8859/15 coding system, Latin-9 environment (Euro)
-(require 'latin-unity-latin9)
-
-;; Latin-10 charset, ISO 8859/16 coding system, Latin-10 environment (Romanian)
-;; Few people will need this, but it avoids screwups.
-(require 'latin-unity-latin10)
+;; Load the latin{7,8,9,10} language environments, character sets, and
+;; coding systems.
+(require 'latin-euro-standards)
;;; User customization is in latin-unity.el
Index: mule-packages/latin-unity/latin-unity.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity.el,v
retrieving revision 1.11
diff -u -r1.11 latin-unity.el
--- mule-packages/latin-unity/latin-unity.el 2004/05/14 08:12:40 1.11
+++ mule-packages/latin-unity/latin-unity.el 2005/02/08 22:17:28
＠＠ -43,12 +43,7 ＠＠
;;; Requires
(require 'latin-unity-vars)
-(require 'latin-unity-latin7) ; define iso-8859-13
-;; uncomment to add support for ISO 8859/14
-;(require 'latin-unity-latin8) ; define iso-8859-14
-(require 'latin-unity-latin9) ; define iso-8859-15
-;; uncomment to add support for ISO 8859/16
-;(require 'latin-unity-latin10) ; define iso-8859-16
+
(if (or (fboundp 'character-to-unicode) ; XEmacs post-21.5.5
(fboundp 'char-to-ucs)) ; Mule-UCS already loaded
(require 'latin-unity-tables "latin-unity-utils")
Index: mule-packages/latin-unity/latin-unity.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity.texi,v
retrieving revision 1.10
diff -u -r1.10 latin-unity.texi
--- mule-packages/latin-unity/latin-unity.texi 2004/05/14 08:12:40 1.10
+++ mule-packages/latin-unity/latin-unity.texi 2005/02/08 22:17:31
＠＠ -10,8 +10,8 ＠＠
＠c %**end of header
＠c Version values, for easy modification
-＠set VERSION 1.0
-＠set UPDATED Thursday 2002 March 23
+＠set VERSION 1.1
+＠set UPDATED Monday, February 7, 2005
＠c ** Many people seem to prefer this footenote style
＠footnotestyle end
＠＠ -1044,16 +1044,12 ＠＠
＠node Interfaces, Charsets and Coding Systems, What latin-unity Cannot Do for You, Top
＠chapter Interfaces
-The Latin-9 language environment is provided in
-(a)file{latin-unity-latin9.el}. This file when compiled contains Latin 9
-characters, so you ＠strong{must} load ＠file{latin-unity-vars.el} first
-to define those characters. Otherwise the Lisp reader is likely to
-signal an error due to stray ISO 2022 control sequences.
-
-Similar considerations apply to ＠file{latin-unity-latin7.el},
-(a)file{latin-unity-latin8.el} and ＠file{latin-unity-latin10.el}.
-
-Sorry, that's all I have to say for now---but it's important!
+Various recent---dating from the end of the nineties---ISO 8859 standard
+language environments used to be provided with this package, but they
+have been refactored out into their own package,
+＠i{latin-euro-standards}, on which this one depends. See the
+documentation for that package if you're interested in using those from
+Lisp.
＠node Charsets and Coding Systems, Internals, Interfaces, Top
＠chapter Charsets and Coding Systems
Index: mule-packages/mule-ucs/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- mule-packages/mule-ucs/Makefile 2005/01/31 20:11:07 1.20
+++ mule-packages/mule-ucs/Makefile 2005/02/08 22:17:32
＠＠ -17,12 +17,12 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.07
+VERSION = 1.08
AUTHOR_VERSION = 0.84
MAINTAINER = Stephen J. Turnbull <stephen(a)xemacs.org>
PACKAGE = mule-ucs
PKG_TYPE = regular
-REQUIRES = mule-base
+REQUIRES = mule-base latin-euro-standards
CATEGORY = mule
# Mule-UCS is a unique package in that it does not compile or run
Index: mule-packages/mule-ucs/lisp/un-define.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/un-define.el,v
retrieving revision 1.2
diff -u -r1.2 un-define.el
--- mule-packages/mule-ucs/lisp/un-define.el 2002/02/13 12:26:14 1.2
+++ mule-packages/mule-ucs/lisp/un-define.el 2005/02/08 22:17:34
＠＠ -36,6 +36,10 ＠＠
(require 'mule-uni)
+;; Load the ISO 8859-13,14,15,16 character sets, to allow us to create
+;; mappings for them.
+(require 'latin-euro-standards)
+
;;; Autoload section
(autoload 'ucs-to-char "unicode")
(autoload 'char-to-ucs "unicode")
＠＠ -125,8 +129,10 ＠＠
greek-iso8859-7
hebrew-iso8859-8
latin-iso8859-9
+ latin-iso8859-13
latin-iso8859-14
latin-iso8859-15
+ latin-iso8859-16
ipa
japanese-jisx0208
japanese-jisx0212
Index: mule-packages/mule-ucs/lisp/un-trbase.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-ucs/lisp/un-trbase.el,v
retrieving revision 1.2
diff -u -r1.2 un-trbase.el
--- mule-packages/mule-ucs/lisp/un-trbase.el 2002/03/18 09:29:02 1.2
+++ mule-packages/mule-ucs/lisp/un-trbase.el 2005/02/08 22:17:35
＠＠ -86,8 +86,10 ＠＠
(latin-iso8859-2 . uiso8859-2)
(latin-iso8859-3 . uiso8859-3)
(latin-iso8859-4 . uiso8859-4)
+ (latin-iso8859-13 . uiso8859-13)
(latin-iso8859-14 . uiso8859-14)
(latin-iso8859-15 . uiso8859-15)
+ (latin-iso8859-16 . uiso8859-16)
(cyrillic-iso8859-5 . uiso8859-5)
(arabic-iso8859-6 . uiso8859-6)
(greek-iso8859-7 . uiso8859-7)
--
“Ah come on now Ted, a Volkswagen with a mind of its own, driving all over
the place and going mad, if that’s not scary I don’t know what is.”
- 1 participants
- 0 comments
[PATCH] Add coding system aliases for utf-16-be and utf-16-le
19 years, 2 months
Aidan Kehoe
Aidan Kehoe
While preparing a trunk patch to integrate JWZ's X selection fixes, I came
across the issue that utf-16-le isn't a coding system on
-current. Implementing it as an alias for utf-16-little-endian seems to be
the most sensible thing to do, to me.
lisp/ChangeLog addition:
2005-01-21 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el:
Add coding system aliases for utf-16-be and utf-16-le, for
improved compatibility with Mule-UCS and the FSF.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/unicode.el
Index: lisp/unicode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/unicode.el,v
retrieving revision 1.9
diff -u -r1.9 unicode.el
--- lisp/unicode.el 2004/11/04 23:05:55 1.9
+++ lisp/unicode.el 2005/01/21 15:56:24
＠＠ -192,6 +192,8 ＠＠
for private, corporate or internal use."
type utf-16))
+(define-coding-system-alias 'utf-16-be 'utf-16)
+
(make-coding-system
'utf-16-bom 'unicode
"UTF-16 w/BOM"
＠＠ -228,6 +230,8 ＠＠
See `utf-16' coding system."
type utf-16
little-endian t))
+
+(define-coding-system-alias 'utf-16-le 'utf-16-little-endian)
(make-coding-system
'utf-16-little-endian-bom 'unicode
--
“Ah come on now Ted, a Volkswagen with a mind of its own, driving all over
the place and going mad, if that’s not scary I don’t know what is.”
- 1 participants
- 1 comments