commit: Handle varalias chains, custom variables in #'user-variable-p.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4502:8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Aug 23 16:38:51 2008 +0200
files: lisp/ChangeLog lisp/custom.el src/ChangeLog src/eval.c src/gc.c src/symbols.c
description:
Handle varalias chains, custom variables in #'user-variable-p.
src/ChangeLog addition:
2008-08-23 Aidan Kehoe <kehoea(a)parhasard.net>
* eval.c (Fuser_variable_p): Moved to symbols.c
* symbols.c (Fcustom_variable_p): Moved here from custom.el.
(user_variable_alias_check_fun): Mapper function used in
`user-variable-p'.
(Fuser_variable_p): Moved here from eval.c, to allow it to examine
the variable alias chain. Expanded to check each entry in the
variable alias chain for signs of being a user variable;
documentation updated, noting the differences between GNU's
behaviour and ours (ours is a little more sensible)
(map_varalias_chain): New.
Given a C function, call it at least once for each symbol in a
symbol's varalias chain, signalling an error if there's a cycle,
and returning immediately if the function returns something other
than Qzero.
(Fdefvaralias): Correct the use of the word "alias" in the
docstring and in the argument name. Motivate this in a
comment. Add support for a DOCSTRING argument, something GNU has
too, and document this
* gc.c (vars_of_gc): Start the docstring of
`garbage-collection-messages' with an asterisk, to indicate that
it's a user variable.
lisp/ChangeLog addition:
2008-08-23 Aidan Kehoe <kehoea(a)parhasard.net>
* custom.el: Move #'custom-variable-p to C, since it's now called
from #'user-variable-p.
diff -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa -r 8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c lisp/ChangeLog
--- a/lisp/ChangeLog Wed Aug 20 17:39:56 2008 +0200
+++ b/lisp/ChangeLog Sat Aug 23 16:38:51 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-08-09 Aidan Kehoe <kehoea＠parhasa
+2008-08-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * custom.el: Move #'custom-variable-p to C, since it's now called
+ from #'user-variable-p.
+
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* subr.el (skip-chars-quote): New.
diff -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa -r 8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c lisp/custom.el
--- a/lisp/custom.el Wed Aug 20 17:39:56 2008 +0200
+++ b/lisp/custom.el Sat Aug 23 16:38:51 2008 +0200
＠＠ -514,11 +514,9 ＠＠ LOAD should be either a library file nam
(put symbol 'custom-autoload t)
(custom-add-load symbol load))
-;; This test is also in the C code of `user-variable-p'.
-(defun custom-variable-p (variable)
- "Return non-nil if VARIABLE is a custom variable."
- (or (get variable 'standard-value)
- (get variable 'custom-autoload)))
+;; XEmacs;
+;; #'custom-variable-p is in symbols.c, since it's called from
+;; #'user-variable-p.
;;; Loading files needed to customize a symbol.
;;; This is in custom.el because menu-bar.el needs it for toggle cmds.
diff -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa -r 8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c src/ChangeLog
--- a/src/ChangeLog Wed Aug 20 17:39:56 2008 +0200
+++ b/src/ChangeLog Sat Aug 23 16:38:51 2008 +0200
＠＠ -1,3 +1,27 ＠＠ 2008-08-09 Aidan Kehoe <kehoea＠parhasa
+2008-08-23 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * eval.c (Fuser_variable_p): Moved to symbols.c
+ * symbols.c (Fcustom_variable_p): Moved here from custom.el.
+ (user_variable_alias_check_fun): Mapper function used in
+ `user-variable-p'.
+ (Fuser_variable_p): Moved here from eval.c, to allow it to examine
+ the variable alias chain. Expanded to check each entry in the
+ variable alias chain for signs of being a user variable;
+ documentation updated, noting the differences between GNU's
+ behaviour and ours (ours is a little more sensible)
+ (map_varalias_chain): New.
+ Given a C function, call it at least once for each symbol in a
+ symbol's varalias chain, signalling an error if there's a cycle,
+ and returning immediately if the function returns something other
+ than Qzero.
+ (Fdefvaralias): Correct the use of the word "alias" in the
+ docstring and in the argument name. Motivate this in a
+ comment. Add support for a DOCSTRING argument, something GNU has
+ too, and document this
+ * gc.c (vars_of_gc): Start the docstring of
+ `garbage-collection-messages' with an asterisk, to indicate that
+ it's a user variable.
+
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
Integrate Romain Francoise' 2005-09-14 (pre-GPLV3) GNU change,
diff -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa -r 8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c src/eval.c
--- a/src/eval.c Wed Aug 20 17:39:56 2008 +0200
+++ b/src/eval.c Sat Aug 23 16:38:51 2008 +0200
＠＠ -1356,29 +1356,8 ＠＠ Since `defconst' unconditionally assigns
return sym;
}
-DEFUN ("user-variable-p", Fuser_variable_p, 1, 1, 0, /*
-Return t if VARIABLE is intended to be set and modified by users.
-\(The alternative is a variable used internally in a Lisp program.)
-Determined by whether the first character of the documentation
-for the variable is `*'.
-*/
- (variable))
-{
- Lisp_Object documentation = Fget (variable, Qvariable_documentation, Qnil);
-
- return
- ((INTP (documentation) && XINT (documentation) < 0) ||
-
- (STRINGP (documentation) &&
- (string_byte (documentation, 0) == '*')) ||
-
- /* If (STRING . INTEGER), a negative integer means a user variable. */
- (CONSP (documentation)
- && STRINGP (XCAR (documentation))
- && INTP (XCDR (documentation))
- && XINT (XCDR (documentation)) < 0)) ?
- Qt : Qnil;
-}
+/* XEmacs: user-variable-p is in symbols.c, since it needs to mess around
+ with the symbol variable aliases. */
DEFUN ("macroexpand-internal", Fmacroexpand_internal, 1, 2, 0, /*
Return result of expanding macros at top level of FORM.
＠＠ -6582,7 +6561,6 ＠＠ syms_of_eval (void)
DEFSUBR (Fdefmacro);
DEFSUBR (Fdefvar);
DEFSUBR (Fdefconst);
- DEFSUBR (Fuser_variable_p);
DEFSUBR (Flet);
DEFSUBR (FletX);
DEFSUBR (Fwhile);
diff -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa -r 8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c src/gc.c
--- a/src/gc.c Wed Aug 20 17:39:56 2008 +0200
+++ b/src/gc.c Sat Aug 23 16:38:51 2008 +0200
＠＠ -2166,7 +2166,7 ＠＠ This means that certain objects should b
*/ );
DEFVAR_BOOL ("garbage-collection-messages", &garbage_collection_messages /*
- Non-nil means display messages at start and end of garbage collection.
+*Non-nil means display messages at start and end of garbage collection.
*/ );
garbage_collection_messages = 0;
diff -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa -r 8748a3f7ceb4d37b2a73b7fcbd8256a05e0b666c src/symbols.c
--- a/src/symbols.c Wed Aug 20 17:39:56 2008 +0200
+++ b/src/symbols.c Sat Aug 23 16:38:51 2008 +0200
＠＠ -84,6 +84,9 ＠＠ static Lisp_Object *value_slot_past_magi
static Lisp_Object *value_slot_past_magic (Lisp_Object sym);
static Lisp_Object follow_varalias_pointers (Lisp_Object symbol,
Lisp_Object follow_past_lisp_magic);
+static Lisp_Object map_varalias_chain (Lisp_Object symbol,
+ Lisp_Object follow_past_lisp_magic,
+ Lisp_Object (*fn) (Lisp_Object arg));
static Lisp_Object
＠＠ -2754,6 +2757,78 ＠＠ A nil value for BUFFER is *not* the same
else
return local_info != 0 ? Qt : Qnil;
}
+
+DEFUN ("custom-variable-p", Fcustom_variable_p, 1, 1, 0, /*
+Return non-nil if SYMBOL names a custom variable.
+Does not follow the variable alias chain.
+*/
+ (symbol))
+{
+ return (!(NILP (Fget(symbol, intern ("standard-value"), Qnil)))
+ || !(NILP (Fget(symbol, intern ("custom-autoload"), Qnil)))) ?
+ Qt: Qnil;
+}
+
+static Lisp_Object
+user_variable_alias_check_fun (Lisp_Object symbol)
+{
+ Lisp_Object documentation = Fget (symbol, Qvariable_documentation, Qnil);
+
+ if ((INTP (documentation) && XINT (documentation) < 0) ||
+ (STRINGP (documentation) &&
+ (string_byte (documentation, 0) == '*')) ||
+ /* If (STRING . INTEGER), a negative integer means a user variable. */
+ (CONSP (documentation)
+ && STRINGP (XCAR (documentation))
+ && INTP (XCDR (documentation))
+ && XINT (XCDR (documentation)) < 0) ||
+ !NILP (Fcustom_variable_p (symbol)))
+ {
+ return make_int(1);
+ }
+
+ return Qzero;
+}
+
+DEFUN ("user-variable-p", Fuser_variable_p, 1, 1, 0, /*
+Return t if SYMBOL names a variable intended to be set and modified by users.
+\(The alternative is a variable used internally in a Lisp program.)
+A symbol names a user variable if
+\(1) the first character of its documentation is `*', or
+\(2) it is customizable (`custom-variable-p' gives t), or
+\(3) it names a variable alias that eventually resolves to another user variable.
+
+The GNU Emacs implementation of `user-variable-p' returns nil if there is a
+loop in the chain of symbols. Since this is indistinguishable from the case
+where a symbol names a non-user variable, XEmacs signals a
+`cyclic-variable-indirection' error instead; use `condition-case' to catch
+this error if you really want to avoid this.
+*/
+ (symbol))
+{
+ Lisp_Object mapped;
+
+ if (!SYMBOLP (symbol))
+ {
+ return Qnil;
+ }
+
+ /* Called for its side-effects, we want it to signal if there's a loop. */
+ follow_varalias_pointers (symbol, Qt);
+
+ /* Look through the various aliases. */
+ mapped = map_varalias_chain (symbol, Qt, user_variable_alias_check_fun);
+ if (EQ (Qzero, mapped))
+ {
+ return Qnil;
+ }
+
+ assert (make_int (1) == mapped);
+
+ return Qt;
+}
+
+
/*
＠＠ -3136,20 +3211,98 ＠＠ follow_varalias_pointers (Lisp_Object sy
return hare;
}
-DEFUN ("defvaralias", Fdefvaralias, 2, 2, 0, /*
+/* Map FN over the chain of variable aliases for SYMBOL. If FN returns
+ something other than Qzero for some link in the chain, return that
+ immediately. Otherwise return Qzero (which is not a symbol).
+
+ FN may be called twice on the same symbol if the varalias chain is
+ cyclic. Prevent this by calling follow_varalias_pointers first for its
+ side-effects.
+
+ Signals a cyclic-variable-indirection error if a cyclic structure is
+ detected. */
+
+static Lisp_Object
+map_varalias_chain (Lisp_Object symbol,
+ Lisp_Object follow_past_lisp_magic,
+ Lisp_Object (*fn) (Lisp_Object arg))
+{
+#define VARALIAS_INDIRECTION_SUSPICION_LENGTH 16
+ Lisp_Object tortoise, hare, val, res;
+ int count;
+
+ assert (fn);
+
+ /* quick out just in case */
+ if (!SYMBOL_VALUE_MAGIC_P (XSYMBOL (symbol)->value))
+ {
+ return (fn)(symbol);
+ }
+
+ /* Compare implementation of indirect_function(). */
+ for (hare = tortoise = symbol, count = 0;
+ val = fetch_value_maybe_past_magic (hare, follow_past_lisp_magic),
+ SYMBOL_VALUE_VARALIAS_P (val);
+ hare = symbol_value_varalias_aliasee (XSYMBOL_VALUE_VARALIAS (val)),
+ count++)
+ {
+ res = (fn) (hare);
+ if (Qzero != res)
+ {
+ return res;
+ }
+
+ if (count < VARALIAS_INDIRECTION_SUSPICION_LENGTH) continue;
+
+ if (count & 1)
+ tortoise = symbol_value_varalias_aliasee
+ (XSYMBOL_VALUE_VARALIAS (fetch_value_maybe_past_magic
+ (tortoise, follow_past_lisp_magic)));
+ if (EQ (hare, tortoise))
+ return Fsignal (Qcyclic_variable_indirection, list1 (symbol));
+ }
+
+ return (fn) (hare);
+}
+
+/*
+
+OED entry, 2nd edition, IPA transliterated using Kirshenbaum:
+
+alias ('eIlI＠s, '&lI＠s), adv. and n.
+[...]
+B. n. (with pl. aliases.)
+1. Another name, an assumed name.
+1605 Camden Rem. (1614) 147 An Alias or double name cannot preiudice the honest.
+1831 Edin. Rev. LIII. 364 He has been assuming various aliases.
+1861 Macaulay Hist. Eng. V. 92 The monk who was sometimes called Harrison
+and sometimes went by the alias of Johnson.
+
+The alias is the fake name. Let's try to follow that usage in our
+documentation.
+
+*/
+
+DEFUN ("defvaralias", Fdefvaralias, 2, 3, 0, /*
Define a variable as an alias for another variable.
Thenceforth, any operations performed on VARIABLE will actually be
-performed on ALIAS. Both VARIABLE and ALIAS should be symbols.
-If ALIAS is nil, remove any aliases for VARIABLE.
-ALIAS can itself be aliased, and the chain of variable aliases
+performed on ALIASED. Both VARIABLE and ALIASED should be symbols.
+If ALIASED is nil and VARIABLE is an existing alias, remove that alias.
+ALIASED can itself be an alias, and the chain of variable aliases
will be followed appropriately.
If VARIABLE already has a value, this value will be shadowed
until the alias is removed, at which point it will be restored.
Currently VARIABLE cannot be a built-in variable, a variable that
has a buffer-local value in any buffer, or the symbols nil or t.
-\(ALIAS, however, can be any type of variable.)
-*/
- (variable, alias))
+\(ALIASED, however, can be any type of variable.)
+
+Optional argument DOCSTRING is documentation for VARIABLE in its use as an
+alias for ALIASED. The XEmacs help code ignores this documentation, using
+the documentation of ALIASED instead, and the docstring, if specified, is
+not shadowed in the same way that the value is. Only use it if you know
+what you're doing.
+*/
+ (variable, aliased, docstring))
{
struct symbol_value_varalias *bfwd;
Lisp_Object valcontents;
＠＠ -3159,7 +3312,7 ＠＠ has a buffer-local value in any buffer,
valcontents = XSYMBOL (variable)->value;
- if (NILP (alias))
+ if (NILP (aliased))
{
if (SYMBOL_VALUE_VARALIAS_P (valcontents))
{
＠＠ -3170,11 +3323,15 ＠＠ has a buffer-local value in any buffer,
return Qnil;
}
- CHECK_SYMBOL (alias);
+ CHECK_SYMBOL (aliased);
+
+ if (!NILP (docstring))
+ Fput (variable, Qvariable_documentation, docstring);
+
if (SYMBOL_VALUE_VARALIAS_P (valcontents))
{
/* transmogrify */
- XSYMBOL_VALUE_VARALIAS (valcontents)->aliasee = alias;
+ XSYMBOL_VALUE_VARALIAS (valcontents)->aliasee = aliased;
return Qnil;
}
＠＠ -3186,7 +3343,7 ＠＠ has a buffer-local value in any buffer,
bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_varalias,
&lrecord_symbol_value_varalias);
bfwd->magic.type = SYMVAL_VARALIAS;
- bfwd->aliasee = alias;
+ bfwd->aliasee = aliased;
bfwd->shadowed = valcontents;
valcontents = wrap_symbol_value_magic (bfwd);
＠＠ -3195,8 +3352,8 ＠＠ has a buffer-local value in any buffer,
}
DEFUN ("variable-alias", Fvariable_alias, 1, 2, 0, /*
-If VARIABLE is aliased to another variable, return that variable.
-VARIABLE should be a symbol. If VARIABLE is not aliased, return nil.
+If VARIABLE is an alias of another variable, return that variable.
+VARIABLE should be a symbol. If VARIABLE is not an alias, return nil.
Variable aliases are created with `defvaralias'. See also
`indirect-variable'.
*/
＠＠ -3755,6 +3912,8 ＠＠ syms_of_symbols (void)
DEFSUBR (Fkill_local_variable);
DEFSUBR (Fkill_console_local_variable);
DEFSUBR (Flocal_variable_p);
+ DEFSUBR (Fcustom_variable_p);
+ DEFSUBR (Fuser_variable_p);
DEFSUBR (Fdefvaralias);
DEFSUBR (Fvariable_alias);
DEFSUBR (Findirect_variable);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
[Bug: 21.5-b28] [PATCH] (user-variable-p 'garbage-collection-messages) => nil
17 years
John Paul Wallington
John Paul Wallington
Hi,
The XEmacs is: XEmacs 21.5-b28 "fuki" (+CVS-20070925) configured for
`i586-pc-win32'.
(user-variable-p 'garbage-collection-messages) returns nil, but I
don't think it should.
Of course, there's no askterisk in the variable's docstring, so maybe
that should be fixed.
More importantly, I think `user-variable-p' should return non-nil for
Customizable variables, checking by doing what `custom-variable-p'
does.
That how GNU Emacs works. Oh, in addition, it returns non-nil if
VARIABLE is an alias for another user variable.
Here's something pinched from GNU Emacs that could be installed, but I
don't have an SDK and can't even say whether it compiles:
diff -u c:\src\xemacs-21.5\src\eval.c~ c:\src\xemacs-21.5\src\eval.c
--- c:\src\xemacs-21.5\src\eval.c~ 2008-08-19 01:43:53.828125000 +0100
+++ c:\src\xemacs-21.5\src\eval.c 2008-08-19 01:43:53.859375000 +0100
＠＠ -1359,8 +1359,9 ＠＠
DEFUN ("user-variable-p", Fuser_variable_p, 1, 1, 0, /*
Return t if VARIABLE is intended to be set and modified by users.
\(The alternative is a variable used internally in a Lisp program.)
-Determined by whether the first character of the documentation
-for the variable is `*'.
+Determined by whether the first character of the documentation for the
+variable is `*' or whether the variable is customizable; see
+also `custom-variable-p'.
*/
(variable))
{
＠＠ -1376,7 +1377,10 ＠＠
(CONSP (documentation)
&& STRINGP (XCAR (documentation))
&& INTP (XCDR (documentation))
- && XINT (XCDR (documentation)) < 0)) ?
+ && XINT (XCDR (documentation)) < 0)) ||
+ /* Customizable? See `custom-variable-p'. */
+ (!NILP (Fget (variable, intern ("standard-value"))))
+ || (!NILP (Fget (variable, intern ("custom-autoload")))) ?
Qt : Qnil;
}
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 2 participants
- 2 comments
carbon2-commit: Carbon: Make FRAME_PIXHEIGHT, FRAME_HEIGHT identical, ditto width.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4535:35f0af76503d232536f7c0f5312fa57767869f15
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Fri Aug 22 19:21:53 2008 +0200
files: src/ChangeLog.carbon2 src/frame-carbon.c
description:
Carbon: Make FRAME_PIXHEIGHT, FRAME_HEIGHT identical, ditto width.
2008-08-22 Aidan Kehoe <kehoea(a)parhasard.net>
* frame-carbon.c (carbon_set_initial_frame_size):
Make FRAME_PIXWIDTH and FRAME_WIDTH, FRAME_PIXHEIGHT and
FRAME_HEIGHT, correspond, since that's what we tell the rest of
the code about them.
diff -r 4655218af377af2f9b8d6e36e110e77dbd836d48 -r 35f0af76503d232536f7c0f5312fa57767869f15 src/ChangeLog.carbon2
--- a/src/ChangeLog.carbon2 Thu Aug 21 23:25:38 2008 +0200
+++ b/src/ChangeLog.carbon2 Fri Aug 22 19:21:53 2008 +0200
＠＠ -1,3 +1,10 ＠＠ 2008-04-05 Aidan Kehoe <kehoea＠parhasa
+2008-08-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * frame-carbon.c (carbon_set_initial_frame_size):
+ Make FRAME_PIXWIDTH and FRAME_WIDTH, FRAME_PIXHEIGHT and
+ FRAME_HEIGHT, correspond, since that's what we tell the rest of
+ the code about them.
+
2008-04-05 Aidan Kehoe <kehoea(a)parhasard.net>
* depend:
diff -r 4655218af377af2f9b8d6e36e110e77dbd836d48 -r 35f0af76503d232536f7c0f5312fa57767869f15 src/frame-carbon.c
--- a/src/frame-carbon.c Thu Aug 21 23:25:38 2008 +0200
+++ b/src/frame-carbon.c Fri Aug 22 19:21:53 2008 +0200
＠＠ -390,14 +390,11 ＠＠ carbon_set_initial_frame_size (struct fr
if (w > 0 || h > 0)
{
default_face_height_and_width (wrap_frame (f), &dh, &dw);
-
- FRAME_HEIGHT (f) = h;
- FRAME_WIDTH (f) = w;
-
- /* change_frame_size (f, h, w, 0); */
-
- FRAME_PIXWIDTH (f) = w * dw;
- FRAME_PIXHEIGHT (f) = h * dh;
+
+ /* We set XDEVIMPF_PIXEL_GEOMETRY in our console method flags --> the
+ pixel dimensions and general dimensions should be identical. */
+ FRAME_PIXWIDTH (f) = FRAME_WIDTH (f) = w * dw;
+ FRAME_PIXHEIGHT (f) = FRAME_HEIGHT (f) = h * dh;
SizeWindow (win, w * dw, h * dh, 0);
}
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: Add #'skip-chars-quote to subr.el
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4533:c4fd85dd95bd72e8c7899ed48075c2fb26e365fa
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Wed Aug 20 17:39:56 2008 +0200
files: lisp/ChangeLog lisp/subr.el
description:
Add #'skip-chars-quote to subr.el
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* subr.el (skip-chars-quote): New.
Given STRING, return a string that means that all characters in
STRING will be skipped when passed to #'skip-chars-forward,
#'skip-chars-backward.
diff -r c86a3c1b7416aa8f0faccdf02e2597c6a0320b15 -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa lisp/ChangeLog
--- a/lisp/ChangeLog Wed Aug 20 17:36:27 2008 +0200
+++ b/lisp/ChangeLog Wed Aug 20 17:39:56 2008 +0200
＠＠ -1,3 +1,10 ＠＠ 2008-08-09 Aidan Kehoe <kehoea＠parhasa
+2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * subr.el (skip-chars-quote): New.
+ Given STRING, return a string that means that all characters in
+ STRING will be skipped when passed to #'skip-chars-forward,
+ #'skip-chars-backward.
+
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/cyril-util.el: Remove. Use the version in packages instead.
diff -r c86a3c1b7416aa8f0faccdf02e2597c6a0320b15 -r c4fd85dd95bd72e8c7899ed48075c2fb26e365fa lisp/subr.el
--- a/lisp/subr.el Wed Aug 20 17:36:27 2008 +0200
+++ b/lisp/subr.el Wed Aug 20 17:39:56 2008 +0200
＠＠ -1722,4 +1722,25 ＠＠ one is kept."
;; define-mail-user-agent is in simple.el.
+;; XEmacs; added.
+(defun skip-chars-quote (string)
+ "Return a string that means all characters in STRING will be skipped,
+if passed to `skip-chars-forward' or `skip-chars-backward'.
+
+Ranges and carets are not treated specially. This implementation is
+in Lisp; do not use it in performance-critical code."
+ (let ((list (delete-duplicates (string-to-list string) :test #'=)))
+ (when (equal list '((?- ?\[) (?\[ ?\-)))
+ (error 'invalid-argument
+ "Cannot create `skip-chars-forward' arg from string"
+ string))
+ (when (memq ?\] list)
+ (setq list (cons ?\] (delq ?\] list))))
+ (when (eq ?^ (car list))
+ (setq list (nconc (cdr list) '(?^))))
+ (when (memq ?- list)
+ (setq list (delq ?- list)
+ list (nconc list (list (second list) ?- (second list) ?-))))
+ (apply #'string list)))
+
;;; subr.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: Port write-region-inhibit-sync, allowing avoidance of bad FS performance.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4531:eb82259f265d18b2bc5c9e76d0f1222f5a0976e8
parent: 4525:89406c31b12521258c83389d19f80440a3a7ce48
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Aug 09 16:44:46 2008 +0200
files: src/ChangeLog src/fileio.c
description:
Port write-region-inhibit-sync, allowing avoidance of bad FS performance.
See http://shaver.off.net/diary/2008/05/25/fsyncers-and-curveballs/ for more
details.
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
Integrate Romain Francoise' 2005-09-14 (pre-GPLV3) GNU change,
which can allow much better performace with some stupid
filesystems:
* fileio.c (write_region_inhibit_fsync): New variable.
(Fwrite_region): Use it to skip call to fsync.
(syms_of_fileio): Initialize it.
diff -r 89406c31b12521258c83389d19f80440a3a7ce48 -r eb82259f265d18b2bc5c9e76d0f1222f5a0976e8 src/ChangeLog
--- a/src/ChangeLog Sat Aug 09 12:13:19 2008 +0200
+++ b/src/ChangeLog Sat Aug 09 16:44:46 2008 +0200
＠＠ -1,3 +1,12 ＠＠ 2008-08-05 Aidan Kehoe <kehoea＠parhasa
+2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ Integrate Romain Francoise' 2005-09-14 (pre-GPLV3) GNU change,
+ which can allow much better performace with some stupid
+ filesystems:
+ * fileio.c (write_region_inhibit_fsync): New variable.
+ (Fwrite_region): Use it to skip call to fsync.
+ (syms_of_fileio): Initialize it.
+
2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* mule-charset.c (complex_vars_of_mule_charset):
diff -r 89406c31b12521258c83389d19f80440a3a7ce48 -r eb82259f265d18b2bc5c9e76d0f1222f5a0976e8 src/fileio.c
--- a/src/fileio.c Sat Aug 09 12:13:19 2008 +0200
+++ b/src/fileio.c Sat Aug 09 16:44:46 2008 +0200
＠＠ -110,6 +110,11 ＠＠ int disable_auto_save_when_buffer_shrink
int disable_auto_save_when_buffer_shrinks;
Lisp_Object Vdirectory_sep_char;
+
+#ifdef HAVE_FSYNC
+/* Nonzero means skip the call to fsync in Fwrite-region. */
+int write_region_inhibit_fsync;
+#endif
/* These variables describe handlers that have "already" had a chance
to handle the current operation.
＠＠ -3568,7 +3573,7 ＠＠ here because write-region handler writer
Disk full in NFS may be reported here. */
/* mib says that closing the file will try to write as fast as NFS can do
it, and that means the fsync here is not crucial for autosave files. */
- if (!auto_saving && fsync (desc) < 0
+ if (!auto_saving && !write_region_inhibit_fsync && fsync (desc) < 0
/* If fsync fails with EINTR, don't treat that as serious. */
&& errno != EINTR)
{
＠＠ -4560,6 +4565,15 ＠＠ File name in which we write a list of al
*/ );
Vauto_save_list_file_name = Qnil;
+#ifdef HAVE_FSYNC
+ DEFVAR_BOOL ("write-region-inhibit-fsync", &write_region_inhibit_fsync /*
+*Non-nil means don't call fsync in `write-region'.
+This variable affects calls to `write-region' as well as save commands.
+A non-nil value may result in data loss!
+*/ );
+ write_region_inhibit_fsync = 0;
+#endif
+
DEFVAR_LISP ("auto-save-list-file-prefix", &Vauto_save_list_file_prefix /*
Prefix for generating auto-save-list-file-name.
Emacs's pid and the system name will be appended to
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: Rename xft_gauge to xft_gauges.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4529:f863b2ee146f38e65e5595bbfb8f9788c052ba3e
user: Mats Lidell <matsl(a)xemacs.org>
date: Sun Aug 03 23:21:31 2008 +0200
files: ChangeLog configure configure.ac src/ChangeLog src/config.h.in
description:
Rename xft_gauge to xft_gauges.
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e ChangeLog
--- a/ChangeLog Sun Aug 03 22:00:52 2008 +0200
+++ b/ChangeLog Sun Aug 03 23:21:31 2008 +0200
＠＠ -1,4 +1,6 ＠＠ 2008-08-03 Mats Lidell <matsl(a)xemacs.o
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * configure.ac: Fix typo xft_gauge to xft_gauges
* configure.ac (XE_COMPLEX_ARG): Use different defaults for
with-xft and without-xft.
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e configure
--- a/configure Sun Aug 03 22:00:52 2008 +0200
+++ b/configure Sun Aug 03 23:21:31 2008 +0200
＠＠ -27333,11 +27333,11 ＠＠ if test "$with_xft_tabs" != "no" ; then
with_xft_tabs="no"
fi
fi
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
+ with_xft_gauges="yes"
else
- with_xft_gauge="no"
+ with_xft_gauges="no"
fi
fi
＠＠ -27529,8 +27529,8 ＠＠ test "$with_xft_tabs" = "yes" && cat >>
#define USE_XFT_TABS 1
_ACEOF
-test "$with_xft_gauge" = "yes" && cat >>confdefs.h <<\_ACEOF
-#define USE_XFT_GAUGE 1
+test "$with_xft_gauges" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_GAUGES 1
_ACEOF
＠＠ -39583,7 +39583,7 ＠＠ if test "$with_xft_tabs" = "yes"; then
echo " - Using Xft to render antialiased fonts in tab controls."
echo " WARNING: This feature will be replaced with a face."
fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
echo " - Using Xft to render antialiased fonts in progress bars."
echo " WARNING: This feature will be replaced with a face."
echo " WARNING: This feature not yet implemented; setting ignored."
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e configure.ac
--- a/configure.ac Sun Aug 03 22:00:52 2008 +0200
+++ b/configure.ac Sun Aug 03 23:21:31 2008 +0200
＠＠ -3541,7 +3541,7 ＠＠ extern Bool XRegisterIMInstantiateCallba
AC_DEFINE(HAVE_FONTCONFIG)
AC_DEFINE(USE_XFT)
dnl Due to interactions with other libraries, must postpone AC_DEFINE
- dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+ dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES.
unset xft_includes_found
fi
fi
＠＠ -4430,11 +4430,11 ＠＠ if test "$with_xft_tabs" != "no" ; then
fi
fi
dnl this is not in xft reloaded #3
-if test "$with_xft_gauge" != "no" ; then
+if test "$with_xft_gauges" != "no" ; then
if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
- with_xft_gauge="yes"
+ with_xft_gauges="yes"
else
- with_xft_gauge="no"
+ with_xft_gauges="no"
fi
fi
＠＠ -4527,7 +4527,7 ＠＠ test "$enable_widgets" = "motif" &&
test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS)
test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS)
-test "$with_xft_gauge" = "yes" && AC_DEFINE(USE_XFT_GAUGE)
+test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES)
dnl ----------------------
dnl Mule-dependent options
＠＠ -6079,7 +6079,7 ＠＠ if test "$with_xft_tabs" = "yes"; then
echo " - Using Xft to render antialiased fonts in tab controls."
echo " WARNING: This feature will be replaced with a face."
fi
-if test "$with_xft_gauge" = "yes"; then
+if test "$with_xft_gauges" = "yes"; then
echo " - Using Xft to render antialiased fonts in progress bars."
echo " WARNING: This feature will be replaced with a face."
echo " WARNING: This feature not yet implemented; setting ignored."
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e src/ChangeLog
--- a/src/ChangeLog Sun Aug 03 22:00:52 2008 +0200
+++ b/src/ChangeLog Sun Aug 03 23:21:31 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-07-20 John Paul Wallington <jpw＠p
+2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * config.h.in: Renamed USE_XFT_GAUGE to USE_XFT_GAUGES in sync
+ with configure.ac.
+
2008-07-20 John Paul Wallington <jpw(a)pobox.com>
* nt.c (Fmswindows_short_file_name, Fmswindows_long_file_name):
diff -r 772c80e0e18073f34cb1bb67cff333a852a07d37 -r f863b2ee146f38e65e5595bbfb8f9788c052ba3e src/config.h.in
--- a/src/config.h.in Sun Aug 03 22:00:52 2008 +0200
+++ b/src/config.h.in Sun Aug 03 23:21:31 2008 +0200
＠＠ -225,7 +225,7 ＠＠ things are arranged in config.h.in. In
/* Per-widget stuff will go away? */
#undef USE_XFT_MENUBARS
#undef USE_XFT_TABS
-#undef USE_XFT_GAUGE
+#undef USE_XFT_GAUGES
/* Defines for building X applications */
#ifdef HAVE_X_WINDOWS
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: with-xft defaults to xft being used with a default setting.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4528:772c80e0e18073f34cb1bb67cff333a852a07d37
parent: 4518:6b0000935adc3f79cb189350d6014d4b4aff734e
user: Mats Lidell <matsl(a)xemacs.org>
date: Sun Aug 03 22:00:52 2008 +0200
files: ChangeLog configure configure.ac lib-src/config.values.in
description:
with-xft defaults to xft being used with a default setting.
If with-xft is not set it is equal to calling configure with-xft=no
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 ChangeLog
--- a/ChangeLog Sat Jul 26 13:50:27 2008 +0300
+++ b/ChangeLog Sun Aug 03 22:00:52 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-07-06 Ville Skyttä <scop(a)xemacs.o
+2008-08-03 Mats Lidell <matsl(a)xemacs.org>
+
+ * configure.ac (XE_COMPLEX_ARG): Use different defaults for
+ with-xft and without-xft.
+
2008-07-06 Ville Skyttä <scop(a)xemacs.org>
* configure.ac (xe_fst):
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 configure
--- a/configure Sat Jul 26 13:50:27 2008 +0300
+++ b/configure Sun Aug 03 22:00:52 2008 +0200
＠＠ -1538,7 +1538,8 ＠＠ Window-system options
`gauges'. Prefix component with `no' to disable its
use of Xft. Requires X11, Xft, Xrender, freetype,
and fontconfig support. Default is `noemacs,
- nomenubars, notabs, nogauges'.
+ nomenubars, notabs, nogauges'. The default when
+ selected is `emacs, nomenubars, notabs, nogauges'.
--with-gtk Support GTK on the X Window System. (EXPERIMENTAL)
--with-gnome Support GNOME on the X Window System. (EXPERIMENTAL)
--with-msw Support MS Windows as a window system (only under
＠＠ -2888,12 +2889,12 ＠＠ fi;
fi;
_xft_notfirst=""
-_xft_emacs_default=no
+_xft_emacs_default=yes
_xft_menubars_default=no
_xft_tabs_default=no
_xft_gauges_default=no
_xft_types="emacs menubars tabs gauges"
-_xft_default="noemacs,nomenubars,notabs,nogauges"
+_xft_default="emacs,nomenubars,notabs,nogauges"
# If --with-xft or --without-xft were given then copy the value to the
# equivalent enable_xft variable.
＠＠ -2970,7 +2971,7 ＠＠ for y in $_xft_types; do
eval "enable_xft_$y=\$_xft_${y}_default"
unset _xft_${y}_default
done
-
+with_xft_emacs=no
fi;
# If --with-gtk or --without-gtk were given then copy the value to the
# equivalent enable_gtk variable.
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 configure.ac
--- a/configure.ac Sat Jul 26 13:50:27 2008 +0300
+++ b/configure.ac Sun Aug 03 22:00:52 2008 +0200
＠＠ -690,9 +690,10 ＠＠ XE_COMPLEX_ARG([xft],
[Xft],
[`emacs' (buffers), `menubars', `tabs', and `gauges'],
[X11, Xft, Xrender, freetype, and fontconfig],
- [`noemacs, nomenubars, notabs, nogauges'])],
- [],[],
- [XE_COMPLEX_OPTION([emacs],[no]),
+ [`noemacs, nomenubars, notabs, nogauges'.
+ The default when selected is `emacs, nomenubars, notabs, nogauges'])],
+ [],[with_xft_emacs=no],
+ [XE_COMPLEX_OPTION([emacs],[yes]),
XE_COMPLEX_OPTION([menubars],[no]),
XE_COMPLEX_OPTION([tabs],[no]),
XE_COMPLEX_OPTION([gauges],[no])])
diff -r 6b0000935adc3f79cb189350d6014d4b4aff734e -r 772c80e0e18073f34cb1bb67cff333a852a07d37 lib-src/config.values.in
--- a/lib-src/config.values.in Sat Jul 26 13:50:27 2008 +0300
+++ b/lib-src/config.values.in Sun Aug 03 22:00:52 2008 +0200
＠＠ -15,178 +15,6 ＠＠
;;; Variables defined in configure by AC_SUBST follow:
;;; (These are used in Makefiles)
-ALLOCA "＠ALLOCA＠"
-ARCHLIBDIR "＠ARCHLIBDIR＠"
-ARCHLIBDIR_USER_DEFINED "＠ARCHLIBDIR_USER_DEFINED＠"
-CC "＠CC＠"
-CFLAGS "＠CFLAGS＠"
-CPP "＠CPP＠"
-CPPFLAGS "＠CPPFLAGS＠"
-DEFS "＠DEFS＠"
-DOCDIR "＠DOCDIR＠"
-DOCDIR_USER_DEFINED "＠DOCDIR_USER_DEFINED＠"
-EARLY_PACKAGE_DIRECTORIES "＠EARLY_PACKAGE_DIRECTORIES＠"
-EARLY_PACKAGE_DIRECTORIES_USER_DEFINED "＠EARLY_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-ECHO_C "＠ECHO_C＠"
-ECHO_N "＠ECHO_N＠"
-ECHO_T "＠ECHO_T＠"
-EGREP "＠EGREP＠"
-ETCDIR "＠ETCDIR＠"
-ETCDIR_USER_DEFINED "＠ETCDIR_USER_DEFINED＠"
-EXEC_PREFIX "＠EXEC_PREFIX＠"
-EXEC_PREFIX_USER_DEFINED "＠EXEC_PREFIX_USER_DEFINED＠"
-EXEEXT "＠EXEEXT＠"
-GTK_CONFIG "＠GTK_CONFIG＠"
-INFODIR "＠INFODIR＠"
-INFODIR_USER_DEFINED "＠INFODIR_USER_DEFINED＠"
-INFOPATH "＠INFOPATH＠"
-INFOPATH_USER_DEFINED "＠INFOPATH_USER_DEFINED＠"
-INSTALL "＠INSTALL＠"
-INSTALLPATH "＠INSTALLPATH＠"
-INSTALL_ARCH_DEP_SUBDIR "＠INSTALL_ARCH_DEP_SUBDIR＠"
-INSTALL_DATA "＠INSTALL_DATA＠"
-INSTALL_PROGRAM "＠INSTALL_PROGRAM＠"
-INSTALL_SCRIPT "＠INSTALL_SCRIPT＠"
-LAST_PACKAGE_DIRECTORIES "＠LAST_PACKAGE_DIRECTORIES＠"
-LAST_PACKAGE_DIRECTORIES_USER_DEFINED "＠LAST_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-LATE_PACKAGE_DIRECTORIES "＠LATE_PACKAGE_DIRECTORIES＠"
-LATE_PACKAGE_DIRECTORIES_USER_DEFINED "＠LATE_PACKAGE_DIRECTORIES_USER_DEFINED＠"
-LDFLAGS "＠LDFLAGS＠"
-LIBOBJS "＠LIBOBJS＠"
-LIBS "＠LIBS＠"
-LIBSTDCPP "＠LIBSTDCPP＠"
-LISPDIR "＠LISPDIR＠"
-LISPDIR_USER_DEFINED "＠LISPDIR_USER_DEFINED＠"
-LN_S "＠LN_S＠"
-LTLIBOBJS "＠LTLIBOBJS＠"
-MAKE_DOCFILE "＠MAKE_DOCFILE＠"
-MAKE_SUBDIR "＠MAKE_SUBDIR＠"
-MODARCHDIR "＠MODARCHDIR＠"
-MODCFLAGS "＠MODCFLAGS＠"
-MODULEDIR "＠MODULEDIR＠"
-MODULEDIR_USER_DEFINED "＠MODULEDIR_USER_DEFINED＠"
-MOD_CC "＠MOD_CC＠"
-MOD_INSTALL_PROGRAM "＠MOD_INSTALL_PROGRAM＠"
-OBJECT_TO_BUILD "＠OBJECT_TO_BUILD＠"
-OBJEXT "＠OBJEXT＠"
-PACKAGE_BUGREPORT "＠PACKAGE_BUGREPORT＠"
-PACKAGE_NAME "＠PACKAGE_NAME＠"
-PACKAGE_PATH "＠PACKAGE_PATH＠"
-PACKAGE_PATH_USER_DEFINED "＠PACKAGE_PATH_USER_DEFINED＠"
-PACKAGE_STRING "＠PACKAGE_STRING＠"
-PACKAGE_TARNAME "＠PACKAGE_TARNAME＠"
-PACKAGE_VERSION "＠PACKAGE_VERSION＠"
-PATH_SEPARATOR "＠PATH_SEPARATOR＠"
-PREFIX "＠PREFIX＠"
-PREFIX_USER_DEFINED "＠PREFIX_USER_DEFINED＠"
-PROGNAME "＠PROGNAME＠"
-RANLIB "＠RANLIB＠"
-RECURSIVE_MAKE_ARGS "＠RECURSIVE_MAKE_ARGS＠"
-SET_MAKE "＠SET_MAKE＠"
-SHELL "＠SHELL＠"
-SITELISPDIR "＠SITELISPDIR＠"
-SITELISPDIR_USER_DEFINED "＠SITELISPDIR_USER_DEFINED＠"
-SITEMODULEDIR "＠SITEMODULEDIR＠"
-SITEMODULEDIR_USER_DEFINED "＠SITEMODULEDIR_USER_DEFINED＠"
-SRC_SUBDIR_DEPS "＠SRC_SUBDIR_DEPS＠"
-SUBDIR_MAKEFILES "＠SUBDIR_MAKEFILES＠"
-XEMACS_CC "＠XEMACS_CC＠"
-XE_CFLAGS "＠XE_CFLAGS＠"
-X_CFLAGS "＠X_CFLAGS＠"
-X_EXTRA_LIBS "＠X_EXTRA_LIBS＠"
-X_LIBS "＠X_LIBS＠"
-X_PRE_LIBS "＠X_PRE_LIBS＠"
-YACC "＠YACC＠"
-abs_builddir "＠abs_builddir＠"
-abs_srcdir "＠abs_srcdir＠"
-abs_top_builddir "＠abs_top_builddir＠"
-abs_top_srcdir "＠abs_top_srcdir＠"
-ac_ct_CC "＠ac_ct_CC＠"
-ac_ct_RANLIB "＠ac_ct_RANLIB＠"
-archlibdir "＠archlibdir＠"
-bindir "＠bindir＠"
-bitmapdir "＠bitmapdir＠"
-blddir "＠blddir＠"
-build "＠build＠"
-build_alias "＠build_alias＠"
-build_cpu "＠build_cpu＠"
-build_os "＠build_os＠"
-build_vendor "＠build_vendor＠"
-builddir "＠builddir＠"
-c_switch_all "＠c_switch_all＠"
-c_switch_general "＠c_switch_general＠"
-c_switch_window_system "＠c_switch_window_system＠"
-canna_libs "＠canna_libs＠"
-configuration "＠configuration＠"
-configure_input "＠configure_input＠"
-datadir "＠datadir＠"
-datarootdir "＠datarootdir＠"
-dll_cflags "＠dll_cflags＠"
-dll_ld "＠dll_ld＠"
-dll_ldflags "＠dll_ldflags＠"
-dll_ldo "＠dll_ldo＠"
-dll_post "＠dll_post＠"
-dnd_objs "＠dnd_objs＠"
-docdir "＠docdir＠"
-dynodump_arch "＠dynodump_arch＠"
-early_packages "＠early_packages＠"
-etcdir "＠etcdir＠"
-exec_prefix "＠exec_prefix＠"
-extra_includes "＠extra_includes＠"
-extra_objs "＠extra_objs＠"
-have_esd_config "＠have_esd_config＠"
-host_alias "＠host_alias＠"
-includedir "＠includedir＠"
-infodir "＠infodir＠"
-infopath "＠infopath＠"
-install_pp "＠install_pp＠"
-inststaticdir "＠inststaticdir＠"
-instvardir "＠instvardir＠"
-internal_makefile_list "＠internal_makefile_list＠"
-last_packages "＠last_packages＠"
-late_packages "＠late_packages＠"
-ld "＠ld＠"
-ld_dynamic_link_flags "＠ld_dynamic_link_flags＠"
-ld_libs_all "＠ld_libs_all＠"
-ld_libs_general "＠ld_libs_general＠"
-ld_libs_window_system "＠ld_libs_window_system＠"
-ld_switch_all "＠ld_switch_all＠"
-ld_switch_general "＠ld_switch_general＠"
-ld_switch_shared "＠ld_switch_shared＠"
-ld_switch_window_system "＠ld_switch_window_system＠"
-ldap_libs "＠ldap_libs＠"
-lib_gcc "＠lib_gcc＠"
-libdir "＠libdir＠"
-libexecdir "＠libexecdir＠"
-libs_xauth "＠libs_xauth＠"
-lispdir "＠lispdir＠"
-localstatedir "＠localstatedir＠"
-lwlib_objs "＠lwlib_objs＠"
-machfile "＠machfile＠"
-mandir "＠mandir＠"
-moduledir "＠moduledir＠"
-native_sound_lib "＠native_sound_lib＠"
-oldincludedir "＠oldincludedir＠"
-opsysfile "＠opsysfile＠"
-package_path "＠package_path＠"
-postgresql_libs "＠postgresql_libs＠"
-prefix "＠prefix＠"
-program_transform_name "＠program_transform_name＠"
-sbindir "＠sbindir＠"
-sharedstatedir "＠sharedstatedir＠"
-sitelispdir "＠sitelispdir＠"
-sitemoduledir "＠sitemoduledir＠"
-sound_cflags "＠sound_cflags＠"
-srcdir "＠srcdir＠"
-start_files "＠start_files＠"
-start_flags "＠start_flags＠"
-statedir "＠statedir＠"
-sysconfdir "＠sysconfdir＠"
-target_alias "＠target_alias＠"
-top_builddir "＠top_builddir＠"
-top_srcdir "＠top_srcdir＠"
-version "＠version＠"
-with_modules "＠with_modules＠"
;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
;;; (These are used in C code)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: Fix the XFT build, thank you Robert Delius Royar.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4526:ea66743ff20155e3a4e479120d7bd68bfe12ac9f
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Aug 10 12:03:10 2008 +0200
files: src/ChangeLog src/objects-xlike-inc.c
description:
Fix the XFT build, thank you Robert Delius Royar.
2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* objects-xlike-inc.c (charset_table): Remove the entry for
Vcharset_arabic_iso8859_7, thank you Robert Delius Royar.
diff -r 89406c31b12521258c83389d19f80440a3a7ce48 -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f src/ChangeLog
--- a/src/ChangeLog Sat Aug 09 12:13:19 2008 +0200
+++ b/src/ChangeLog Sun Aug 10 12:03:10 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-08-05 Aidan Kehoe <kehoea＠parhasa
+2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * objects-xlike-inc.c (charset_table): Remove the entry for
+ Vcharset_arabic_iso8859_7, thank you Robert Delius Royar.
+
2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* mule-charset.c (complex_vars_of_mule_charset):
diff -r 89406c31b12521258c83389d19f80440a3a7ce48 -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f src/objects-xlike-inc.c
--- a/src/objects-xlike-inc.c Sat Aug 09 12:13:19 2008 +0200
+++ b/src/objects-xlike-inc.c Sun Aug 10 12:03:10 2008 +0200
＠＠ -358,7 +358,6 ＠＠ static struct charset_reporter charset_t
{ &Vcharset_latin_iso8859_9, NULL, NULL },
{ &Vcharset_latin_iso8859_15, NULL, NULL },
{ &Vcharset_thai_tis620, NULL, NULL },
- { &Vcharset_arabic_iso8859_6, NULL, NULL },
{ &Vcharset_hebrew_iso8859_8, "Hebrew", "he" },
{ &Vcharset_cyrillic_iso8859_5, NULL, NULL },
/* #### these probably are not quite right */
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: Correct a test failure now the XEmacs-specific Arabic charsets are gone.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4527:c95c06ee1e9daec9cd268f3603b1059d9068d656
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Aug 10 12:15:56 2008 +0200
files: etc/ChangeLog etc/HELLO tests/ChangeLog tests/automated/mule-tests.el
description:
Correct a test failure now the XEmacs-specific Arabic charsets are gone.
etc/ChangeLog addition:
2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* HELLO: Add a coding cookie, now the UTF-8 sequences prevent the
file being recognised as ISO-2022-7 automatically.
tests/ChangeLog addition:
2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el (featurep): Update the list of character
sets in etc/HELLO to reflect that we've deleted the
XEmacs-specific Arabic character sets.
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 etc/ChangeLog
--- a/etc/ChangeLog Sun Aug 10 12:03:10 2008 +0200
+++ b/etc/ChangeLog Sun Aug 10 12:15:56 2008 +0200
＠＠ -1,3 +1,8 ＠＠ 2008-08-05 Aidan Kehoe <kehoea＠parhasa
+2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * HELLO: Add a coding cookie, now the UTF-8 sequences prevent the
+ file being recognised as ISO-2022-7 automatically.
+
2008-08-05 Aidan Kehoe <kehoea(a)parhasard.net>
* HELLO: Encode the Arabic using UTF-8 sequences, not ISO-8859-6.
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 etc/HELLO
--- a/etc/HELLO Sun Aug 10 12:03:10 2008 +0200
+++ b/etc/HELLO Sun Aug 10 12:15:56 2008 +0200
＠＠ -1,3 +1,5 ＠＠ You need many fonts to read all.
+-*- coding: iso-2022-7 -*-
+
You need many fonts to read all.
Please correct this incomplete list and add more!
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 tests/ChangeLog
--- a/tests/ChangeLog Sun Aug 10 12:03:10 2008 +0200
+++ b/tests/ChangeLog Sun Aug 10 12:15:56 2008 +0200
＠＠ -1,3 +1,9 ＠＠ 2008-05-21 Aidan Kehoe <kehoea＠parhasa
+2008-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/mule-tests.el (featurep): Update the list of character
+ sets in etc/HELLO to reflect that we've deleted the
+ XEmacs-specific Arabic character sets.
+
2008-05-21 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el (featurep):
diff -r ea66743ff20155e3a4e479120d7bd68bfe12ac9f -r c95c06ee1e9daec9cd268f3603b1059d9068d656 tests/automated/mule-tests.el
--- a/tests/automated/mule-tests.el Sun Aug 10 12:03:10 2008 +0200
+++ b/tests/automated/mule-tests.el Sun Aug 10 12:15:56 2008 +0200
＠＠ -527,20 +527,20 ＠＠ This is a naive implementation in Lisp.
;; irrelevant.
(sort (charsets-in-region (point-min) (point-max))
#'string<)
- '(arabic-1-column arabic-2-column ascii chinese-big5-1
- chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
- hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
- katakana-jisx0201 korean-ksc5601 latin-iso8859-1
- latin-iso8859-2 thai-xtis vietnamese-viscii-lower)))
+ '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5
+ ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208
+ japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201
+ korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis
+ vietnamese-viscii-lower)))
(Assert (equal
(sort (charsets-in-string (buffer-substring (point-min)
(point-max)))
#'string<)
- '(arabic-1-column arabic-2-column ascii chinese-big5-1
- chinese-gb2312 cyrillic-iso8859-5 ethiopic greek-iso8859-7
- hebrew-iso8859-8 japanese-jisx0208 japanese-jisx0212
- katakana-jisx0201 korean-ksc5601 latin-iso8859-1
- latin-iso8859-2 thai-xtis vietnamese-viscii-lower))))
+ '(ascii chinese-big5-1 chinese-gb2312 cyrillic-iso8859-5
+ ethiopic greek-iso8859-7 hebrew-iso8859-8 japanese-jisx0208
+ japanese-jisx0212 jit-ucs-charset-0 katakana-jisx0201
+ korean-ksc5601 latin-iso8859-1 latin-iso8859-2 thai-xtis
+ vietnamese-viscii-lower))))
;;---------------------------------------------------------------
;; Language environments, and whether the specified values are sane.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
carbon2-commit: Remove mule/cyril-util.el from the 21.5 trunk.
17 years
Aidan Kehoe
Aidan Kehoe
changeset: 4525:89406c31b12521258c83389d19f80440a3a7ce48
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Aug 09 12:13:19 2008 +0200
files: lisp/ChangeLog lisp/mule/cyril-util.el
description:
Remove mule/cyril-util.el from the 21.5 trunk.
2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/cyril-util.el: Remove. Use the version in packages instead.
diff -r 121aadac896ec8196ca90059f99e957c2ccef516 -r 89406c31b12521258c83389d19f80440a3a7ce48 lisp/ChangeLog
--- a/lisp/ChangeLog Fri Aug 08 21:28:13 2008 +0200
+++ b/lisp/ChangeLog Sat Aug 09 12:13:19 2008 +0200
＠＠ -1,3 +1,7 ＠＠ 2008-08-08 Aidan Kehoe <kehoea＠parhasa
+2008-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * mule/cyril-util.el: Remove. Use the version in packages instead.
+
2008-08-08 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el:
diff -r 121aadac896ec8196ca90059f99e957c2ccef516 -r 89406c31b12521258c83389d19f80440a3a7ce48 lisp/mule/cyril-util.el
--- a/lisp/mule/cyril-util.el Fri Aug 08 21:28:13 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
＠＠ -1,193 +0,0 ＠＠
-;;; cyril-util.el --- utilities for Cyrillic scripts -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 1997 Free Software Foundation, Inc.
-;; Copyright (C) 2002 Ben Wing.
-
-;; Keywords: mule, multilingual, Cyrillic
-
-;; This file is part of XEmacs.
-
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
-
-;;; Synched up with: Emacs 21.1 (language/cyril-util.el).
-
-;;; Commentary:
-
-;;; #### Remove this, use the one in packages instead, but with the below
-;;; standard-display-cyrillic-translit. This file is unfortunately shadowed
-;;; if you have the Mule packages installed!
-
-;;; Code:
-
-
-;; Display
-
-;; Written by Valery Alexeev <valery(a)math.uga.edu>.
-
-(defvar cyrillic-language-alist
- '(("Belorussian") ("Bulgarian") ("Macedonian") ("Russian") ("Serbian")
- ("Ukrainian"))
- "*List of known Cyrillic languages")
-
-;;;###autoload
-(defun standard-display-cyrillic-translit (&optional cyrillic-language
- disable)
- "Display a cyrillic buffer using a transliteration.
-For readability, the table is slightly
-different from the one used for the input method `cyrillic-translit'.
-
-The argument is a string which specifies which language you are using;
-that affects the choice of transliterations slightly.
-Possible values are listed in 'cyrillic-language-alist'.
-
-Specifying a prefix arg, by preceding
-\\[standard-display-cyrillic-translit] with \\[universal-argument]
-turns off Cyrillic display. Noninteractively, the DISABLE argument
-does the same thing. "
- (interactive
- (list
- (let* ((completion-ignore-case t)
- (default-language (if (assoc-ignore-case
- current-language-environment
- cyrillic-language-alist)
- current-language-environment
- "Russian")))
- (or current-prefix-arg
- (completing-read
- (format "Cyrillic language (default %s): " default-language)
- cyrillic-language-alist nil t nil nil default-language)))))
- (frob-display-table
- (lambda (display-table)
- (if (or disable current-prefix-arg)
- (if (char-table-p display-table)
- (remove-char-table 'cyrillic-iso8859-5 display-table))
- (put-display-table ?,LP(B "a" display-table)
- (put-display-table ?,LQ(B "b" display-table)
- (put-display-table ?,LR(B "v" display-table)
- (put-display-table ?,LS(B "g" display-table)
- (put-display-table ?,LT(B "d" display-table)
- (put-display-table ?,LU(B "e" display-table)
- (put-display-table ?,Lq(B "yo" display-table)
- (put-display-table ?,LV(B "zh" display-table)
- (put-display-table ?,LW(B "z" display-table)
- (put-display-table ?,LX(B "i" display-table)
- (put-display-table ?,LY(B "j" display-table)
- (put-display-table ?,LZ(B "k" display-table)
- (put-display-table ?,L[(B "l" display-table)
- (put-display-table ?,L\(B "m" display-table)
- (put-display-table ?,L](B "n" display-table)
- (put-display-table ?,L^(B "o" display-table)
- (put-display-table ?,L_(B "p" display-table)
- (put-display-table ?,L`(B "r" display-table)
- (put-display-table ?,La(B "s" display-table)
- (put-display-table ?,Lb(B "t" display-table)
- (put-display-table ?,Lc(B "u" display-table)
- (put-display-table ?,Ld(B "f" display-table)
- (put-display-table ?,Le(B "kh" display-table)
- (put-display-table ?,Lf(B "ts" display-table)
- (put-display-table ?,Lg(B "ch" display-table)
- (put-display-table ?,Lh(B "sh" display-table)
- (put-display-table ?,Li(B "sch" display-table)
- (put-display-table ?,Lj(B "~" display-table)
- (put-display-table ?,Lk(B "y" display-table)
- (put-display-table ?,Ll(B "'" display-table)
- (put-display-table ?,Lm(B "e'" display-table)
- (put-display-table ?,Ln(B "yu" display-table)
- (put-display-table ?,Lo(B "ya" display-table)
- (put-display-table ?,L0(B "A" display-table)
- (put-display-table ?,L1(B "B" display-table)
- (put-display-table ?,L2(B "V" display-table)
- (put-display-table ?,L3(B "G" display-table)
- (put-display-table ?,L4(B "D" display-table)
- (put-display-table ?,L5(B "E" display-table)
- (put-display-table ?,L!(B "Yo" display-table)
- (put-display-table ?,L6(B "Zh" display-table)
- (put-display-table ?,L7(B "Z" display-table)
- (put-display-table ?,L8(B "I" display-table)
- (put-display-table ?,L9(B "J" display-table)
- (put-display-table ?,L:(B "K" display-table)
- (put-display-table ?,L;(B "L" display-table)
- (put-display-table ?,L<(B "M" display-table)
- (put-display-table ?,L=(B "N" display-table)
- (put-display-table ?,L>(B "O" display-table)
- (put-display-table ?,L?(B "P" display-table)
- (put-display-table ?,L＠(B "R" display-table)
- (put-display-table ?,LA(B "S" display-table)
- (put-display-table ?,LB(B "T" display-table)
- (put-display-table ?,LC(B "U" display-table)
- (put-display-table ?,LD(B "F" display-table)
- (put-display-table ?,LE(B "Kh" display-table)
- (put-display-table ?,LF(B "Ts" display-table)
- (put-display-table ?,LG(B "Ch" display-table)
- (put-display-table ?,LH(B "Sh" display-table)
- (put-display-table ?,LI(B "Sch" display-table)
- (put-display-table ?,LJ(B "~" display-table)
- (put-display-table ?,LK(B "Y" display-table)
- (put-display-table ?,LL(B "'" display-table)
- (put-display-table ?,LM(B "E'" display-table)
- (put-display-table ?,LN(B "Yu" display-table)
- (put-display-table ?,LO(B "Ya" display-table)
- (put-display-table ?,Lt(B "ie" display-table)
- (put-display-table ?,Lw(B "i" display-table)
- (put-display-table ?,L~(B "u" display-table)
- (put-display-table ?,Lr(B "dj" display-table)
- (put-display-table ?,L{(B "chj" display-table)
- (put-display-table ?,Ls(B "gj" display-table)
- (put-display-table ?,Lu(B "s" display-table)
- (put-display-table ?,L|(B "k" display-table)
- (put-display-table ?,Lv(B "i" display-table)
- (put-display-table ?,Lx(B "j" display-table)
- (put-display-table ?,Ly(B "lj" display-table)
- (put-display-table ?,Lz(B "nj" display-table)
- (put-display-table ?,L(B "dz" display-table)
- (put-display-table ?,L$(B "Ye" display-table)
- (put-display-table ?,L'(B "Yi" display-table)
- (put-display-table ?,L.(B "U" display-table)
- (put-display-table ?,L"(B "Dj" display-table)
- (put-display-table ?,L+(B "Chj" display-table)
- (put-display-table ?,L#(B "Gj" display-table)
- (put-display-table ?,L%(B "S" display-table)
- (put-display-table ?,L,(B "K" display-table)
- (put-display-table ?,L&(B "I" display-table)
- (put-display-table ?,L((B "J" display-table)
- (put-display-table ?,L)(B "Lj" display-table)
- (put-display-table ?,L*(B "Nj" display-table)
- (put-display-table ?,L/(B "Dj" display-table)
-
- (when (equal cyrillic-language "Bulgarian")
- (put-display-table ?,Li(B "sht" display-table)
- (put-display-table ?,LI(B "Sht" display-table)
- (put-display-table ?,Ln(B "iu" display-table)
- (put-display-table ?,LN(B "Iu" display-table)
- (put-display-table ?,Lo(B "ia" display-table)
- (put-display-table ?,LO(B "Ia" display-table))
-
- (when (equal cyrillic-language "Ukrainian") ; based on the official
- ; transliteration table
- (put-display-table ?,LX(B "y" display-table)
- (put-display-table ?,L8(B "Y" display-table)
- (put-display-table ?,LY(B "i" display-table)
- (put-display-table ?,L9(B "Y" display-table)
- (put-display-table ?,Ln(B "iu" display-table)
- (put-display-table ?,Lo(B "ia" display-table)))) nil))
-;;
-(provide 'cyril-util)
-
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
-
-;;; cyril-util.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments