[COMMIT] Revert to original language environment, tests/automated/mule-tests.el.
15 years, 4 months
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1249917908 -3600
# Node ID 938ffa3ffe4d6d3828e3d943d8e815013c42c4e2
# Parent e9b88e997479be2bc8611b570a25da4ea54eca53
Revert to original language environment, tests/automated/mule-tests.el.
tests/ChangeLog addition:
2009-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el:
Revert to the original language environment once we've tested all
the others, preventing things like a Chinese terminal coding
system being selected when you actually have a UTF-8 tty.
diff -r e9b88e997479 -r 938ffa3ffe4d tests/ChangeLog
--- a/tests/ChangeLog Mon Aug 10 16:22:09 2009 +0100
+++ b/tests/ChangeLog Mon Aug 10 16:25:08 2009 +0100
@@ -1,3 +1,10 @@
+2009-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/mule-tests.el:
+ Revert to the original language environment once we've tested all
+ the others, preventing things like a Chinese terminal coding
+ system being selected when you actually have a UTF-8 tty.
+
2009-07-13 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/mule-tests.el:
diff -r e9b88e997479 -r 938ffa3ffe4d tests/automated/mule-tests.el
--- a/tests/automated/mule-tests.el Mon Aug 10 16:22:09 2009 +0100
+++ b/tests/automated/mule-tests.el Mon Aug 10 16:25:08 2009 +0100
@@ -575,6 +575,7 @@
for language in (mapcar #'car language-info-alist)
with language-input-method = nil
with native-coding-system = nil
+ with original-language-environment = current-language-environment
do
;; s-l-e can call #'require, which says "Loading ..."
(Silence-Message (set-language-environment language))
@@ -613,7 +614,8 @@
;; We don't have the appropriate POSIX locales to test with a
;; native-coding-system that is a function.
(unless (functionp coding-system)
- (Assert (coding-system-p (find-coding-system coding-system))))))
+ (Assert (coding-system-p (find-coding-system coding-system)))))
+ finally (set-language-environment original-language-environment))
(with-temp-buffer
(flet
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Deal with arglist newlines better, #'function-arglist
15 years, 4 months
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1249917729 -3600
# Node ID e9b88e997479be2bc8611b570a25da4ea54eca53
# Parent 5a54ce6dc945279db370f99b25772b6d7aad352f
Deal with arglist newlines better, #'function-arglist, #'function-documentation
lisp/ChangeLog addition:
2009-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (function-arglist, function-documentation):
Deal more gracefully with tabs in the function arglist; in
function-documentation, when stripping the arglist, pay attention
to the fact that they may span multiple lines.
diff -r 5a54ce6dc945 -r e9b88e997479 lisp/ChangeLog
--- a/lisp/ChangeLog Sun Aug 09 12:38:04 2009 +0100
+++ b/lisp/ChangeLog Mon Aug 10 16:22:09 2009 +0100
@@ -1,3 +1,10 @@
+2009-08-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * help.el (function-arglist, function-documentation):
+ Deal more gracefully with tabs in the function arglist; in
+ function-documentation, when stripping the arglist, pay attention
+ to the fact that they may span multiple lines.
+
2009-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* faces.el (set-face-background-pixmap-file):
diff -r 5a54ce6dc945 -r e9b88e997479 lisp/help.el
--- a/lisp/help.el Sun Aug 09 12:38:04 2009 +0100
+++ b/lisp/help.el Mon Aug 10 16:22:09 2009 +0100
@@ -1196,7 +1196,7 @@
doc)
(match-string 1 doc)))
(args (and args (replace-in-string args
- "[ ]*\\\\\n[ ]*"
+ "[ ]*\\\\\n[ \t]*"
" " t))))
;; If there are no arguments documented for the
;; subr, rather don't print anything.
@@ -1225,7 +1225,7 @@
(void-function "(alias for undefined function)")
(error "(unexpected error from `documention')"))))
(if (and strip-arglist
- (string-match "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'" doc))
+ (string-match "[\n\t ]*\narguments: ?(\\([^)]*\\))\n?\\'" doc))
(setq doc (substring doc 0 (match-beginning 0))))
doc))
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] Make multiple-values functions substs in 21.4
15 years, 4 months
Aidan Kehoe
Hi Vin --
We’ve been running with Jerry’s code below in 21.5 since 2004, and it’s not
on the face of it very risky. It is something I need for a 21.5 change I
want to make, though, in order for the packages built with 21.4 to continue
to not throw random errors with 21.5.
The gory details are that I have added C support for multiple values, and if
the package byte code tries to call #'values or #'multiple-value-list at
runtime (which it does if #'values is implemented as an alias for #'list,
for example), it will get inconsistent behaviour with itself on 21.5. If it
uses the inline expansion, the functions themselves won’t be called at
runtime.
Best,
Aidan
2009-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* cl.el (values):
* cl.el (values-list):
* cl.el (multiple-value-list):
* cl.el (multiple-value-apply):
* cl.el (multiple-value-call):
* cl.el (nth-value):
Make most of these defsubsts, not aliases, so the byte-code
generated doesn't try to call #'values or #'multiple-value-list at
runtime; now that these do useful things in 21.5, we need to avoid
that if we want to compile code that will work there.
--- lisp/cl.el~ 2004-06-22 02:49:47.001000000 +0100
+++ lisp/cl.el 2009-08-09 14:49:06.703125000 +0100
@@ -248,12 +248,41 @@
;;; simulated. Instead, multiple-value-bind and friends simply expect
;;; the target form to return the values as a list.
-(defalias 'values 'list)
-(defalias 'values-list 'identity)
-(defalias 'multiple-value-list 'identity)
-(defalias 'multiple-value-call 'apply) ; only works for one arg
-(defalias 'nth-value 'nth)
+(defsubst values (&rest values)
+ "Return multiple values, Common Lisp style.
+The arguments of `values' are the values
+that the containing function should return."
+ values)
+
+(defsubst values-list (list)
+ "Return multiple values, Common Lisp style, taken from a list.
+LIST specifies the list of values
+that the containing function should return."
+ list)
+(defsubst multiple-value-list (expression)
+ "Return a list of the multiple values produced by EXPRESSION.
+This handles multiple values in Common Lisp style, but it does not
+work right when EXPRESSION calls an ordinary Emacs Lisp function
+that returns just one value."
+ expression)
+
+(defsubst multiple-value-apply (function expression)
+ "Evaluate EXPRESSION to get multiple values and apply FUNCTION to them.
+This handles multiple values in Common Lisp style, but it does not work
+right when EXPRESSION calls an ordinary Emacs Lisp function that returns just
+one value."
+ (apply function expression))
+
+(defalias 'multiple-value-call 'apply) ; only works for one arg; not
+ ; used in any of the packages.
+
+(defsubst nth-value (n expression)
+ "Evaluate EXPRESSION to get multiple values and return the Nth one.
+This handles multiple values in Common Lisp style, but it does not work
+right when EXPRESSION calls an ordinary Emacs Lisp function that returns just
+one value."
+ (nth n expression))
;;; Macros.
--
hi there!
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Remove some extra parentheses, #'set-face-background-pixmap-file.
15 years, 4 months
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1249817884 -3600
# Node ID 5a54ce6dc945279db370f99b25772b6d7aad352f
# Parent 2c1fa63dddbc000e31b166b486b66f6a996c2211
Remove some extra parentheses, #'set-face-background-pixmap-file.
lisp/ChangeLog addition:
2009-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* faces.el (set-face-background-pixmap-file):
Remove some extra parentheses revealed by change set 7757334005ae.
diff -r 2c1fa63dddbc -r 5a54ce6dc945 lisp/ChangeLog
--- a/lisp/ChangeLog Tue Jul 28 23:29:22 2009 +0900
+++ b/lisp/ChangeLog Sun Aug 09 12:38:04 2009 +0100
@@ -1,3 +1,8 @@
+2009-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * faces.el (set-face-background-pixmap-file):
+ Remove some extra parentheses revealed by change set 7757334005ae.
+
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* startup.el (startup-setup-paths): Use `emacs-data-roots' instead
diff -r 2c1fa63dddbc -r 5a54ce6dc945 lisp/faces.el
--- a/lisp/faces.el Tue Jul 28 23:29:22 2009 +0900
+++ b/lisp/faces.el Sun Aug 09 12:38:04 2009 +0100
@@ -706,8 +706,8 @@
(interactive
(let* ((face (read-face-name "Set background pixmap of face: "))
(default (and (face-background-pixmap-instance face)
- ((image-instance-file-name
- (face-background-pixmap-instance face)))))
+ (image-instance-file-name
+ (face-background-pixmap-instance face))))
(file (read-file-name
(format "Set background pixmap of face %s to: "
(symbol-name face))
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Remove some extra parentheses, #'set-face-background-pixmap-file.
15 years, 4 months
Aidan Kehoe
changeset: 4670:5a54ce6dc945
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Aug 09 12:38:04 2009 +0100
files: lisp/ChangeLog lisp/faces.el
description:
Remove some extra parentheses, #'set-face-background-pixmap-file.
lisp/ChangeLog addition:
2009-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
* faces.el (set-face-background-pixmap-file):
Remove some extra parentheses revealed by change set 7757334005ae.
diff -r 2c1fa63dddbc -r 5a54ce6dc945 lisp/ChangeLog
--- a/lisp/ChangeLog Tue Jul 28 23:29:22 2009 +0900
+++ b/lisp/ChangeLog Sun Aug 09 12:38:04 2009 +0100
@@ -1,3 +1,8 @@
+2009-08-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * faces.el (set-face-background-pixmap-file):
+ Remove some extra parentheses revealed by change set 7757334005ae.
+
2009-07-28 Mike Sperber <mike(a)xemacs.org>
* startup.el (startup-setup-paths): Use `emacs-data-roots' instead
diff -r 2c1fa63dddbc -r 5a54ce6dc945 lisp/faces.el
--- a/lisp/faces.el Tue Jul 28 23:29:22 2009 +0900
+++ b/lisp/faces.el Sun Aug 09 12:38:04 2009 +0100
@@ -706,8 +706,8 @@
(interactive
(let* ((face (read-face-name "Set background pixmap of face: "))
(default (and (face-background-pixmap-instance face)
- ((image-instance-file-name
- (face-background-pixmap-instance face)))))
+ (image-instance-file-name
+ (face-background-pixmap-instance face))))
(file (read-file-name
(format "Set background pixmap of face %s to: "
(symbol-name face))
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches