[AC pgg] Revert Aidan's last commit to fix smoketest
15 years, 11 months
Stephen J. Turnbull
APPROVE COMMIT pgg
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/ChangeLog,v
retrieving revision 1.27
diff -u -r1.27 ChangeLog
--- ChangeLog 25 Jan 2009 22:06:41 -0000 1.27
+++ ChangeLog 26 Jan 2009 09:24:06 -0000
＠＠ -0,0 +1,4 ＠＠
+2009-01-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * Revert Aidan's last commit.
+
Index: pgg-parse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-parse.el,v
retrieving revision 1.6
diff -u -r1.6 pgg-parse.el
--- pgg-parse.el 25 Jan 2009 22:06:42 -0000 1.6
+++ pgg-parse.el 26 Jan 2009 09:24:06 -0000
＠＠ -35,7 +35,7 ＠＠
;;; Code:
-(eval-when-compile (require 'cl) (when (featurep 'mule) (require 'ccl)))
+(eval-when-compile (require 'cl))
(defgroup pgg-parse ()
"OpenPGP packet parsing."
＠＠ -159,42 +159,25 ＠＠
(defmacro pgg-set-alist (alist key value)
`(setq ,alist (nconc ,alist (list (cons ,key ,value)))))
-(defconst pgg-parse-crc24
- (eval-when-compile
- (let ((pre-existing
- [1 30 14 114744 114775 0 161 131127 1 148217 15 82167 1 1848
- 131159 1 1595 5 256 114743 390 114775 19707 1467 16 7 183 1 -5628
- -7164 22]))
- (when (fboundp #'ccl-compile)
- (assert
- (equal
- pre-existing
- (ccl-compile
- '(1
- ((loop
- (read r0) (r1 ^= r0) (r2 ^= 0)
- (r5 = 0)
- (loop
- (r1 <<= 1)
- (r1 += ((r2 >> 15) & 1))
- (r2 <<= 1)
- (if (r1 & 256)
- ((r1 ^= 390) (r2 ^= 19707)))
- (if (r5 < 7)
- ((r5 += 1)
- (repeat))))
- (repeat))))))
- nil
- "The pre-compiled CCL program appears broken, or the implementation
-of `ccl-compile' has changed versus to when this code was written. "))
- pre-existing))
- "A CCL program to parse CRC 24 checksums. See `define-ccl-program'.")
+(when (fboundp 'define-ccl-program)
-(put 'pgg-parse-crc24 'ccl-program-idx
- (register-ccl-program 'pgg-parse-crc24 pgg-parse-crc24))
+ (define-ccl-program pgg-parse-crc24
+ '(1
+ ((loop
+ (read r0) (r1 ^= r0) (r2 ^= 0)
+ (r5 = 0)
+ (loop
+ (r1 <<= 1)
+ (r1 += ((r2 >> 15) & 1))
+ (r2 <<= 1)
+ (if (r1 & 256)
+ ((r1 ^= 390) (r2 ^= 19707)))
+ (if (r5 < 7)
+ ((r5 += 1)
+ (repeat))))
+ (repeat)))))
-(defun pgg-parse-crc24-string (string)
- (when (fboundp #'ccl-execute-on-string)
+ (defun pgg-parse-crc24-string (string)
(let ((h (vector nil 183 1230 nil nil nil nil nil nil)))
(ccl-execute-on-string pgg-parse-crc24 h string)
(format "%c%c%c"
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Check CCL available at run time, not compile time, in PGG.
15 years, 11 months
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
(I should be working, but I noticed this, and if I hadn’t committed it now,
I doubt it would have been committed in this calendar year. See
http://mid.gmane.org/vpdhcif81o9.fsf＠informatik.uni-tuebingen.de for the
original problem and the associated discussion.)
xemacs-packages/pgg/ChangeLog addition:
2007-12-23 Aidan Kehoe <kehoea(a)parhasard.net>
* pgg-parse.el (pgg-parse-crc24):
Provide the CCL program, independent of whether
#'define-ccl-program was available at compile time.
* pgg-parse.el (pgg-parse-crc24-string):
Only call the CCL program if #'ccl-execute-on-string is available,
which it will be, if the current emacs has CCL support.
XEmacs Packages source patch:
Diff command: cvs -q diff -Nu
Files affected: xemacs-packages/pgg/pgg-parse.el
===================================================================
RCS
Index: xemacs-packages/pgg/pgg-parse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-parse.el,v
retrieving revision 1.5
diff -u -u -r1.5 pgg-parse.el
--- xemacs-packages/pgg/pgg-parse.el 2005/09/23 12:53:14 1.5
+++ xemacs-packages/pgg/pgg-parse.el 2009/01/25 22:06:13
＠＠ -35,7 +35,7 ＠＠
;;; Code:
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl) (when (featurep 'mule) (require 'ccl)))
(defgroup pgg-parse ()
"OpenPGP packet parsing."
＠＠ -159,25 +159,42 ＠＠
(defmacro pgg-set-alist (alist key value)
`(setq ,alist (nconc ,alist (list (cons ,key ,value)))))
-(when (fboundp 'define-ccl-program)
+(defconst pgg-parse-crc24
+ (eval-when-compile
+ (let ((pre-existing
+ [1 30 14 114744 114775 0 161 131127 1 148217 15 82167 1 1848
+ 131159 1 1595 5 256 114743 390 114775 19707 1467 16 7 183 1 -5628
+ -7164 22]))
+ (when (fboundp #'ccl-compile)
+ (assert
+ (equal
+ pre-existing
+ (ccl-compile
+ '(1
+ ((loop
+ (read r0) (r1 ^= r0) (r2 ^= 0)
+ (r5 = 0)
+ (loop
+ (r1 <<= 1)
+ (r1 += ((r2 >> 15) & 1))
+ (r2 <<= 1)
+ (if (r1 & 256)
+ ((r1 ^= 390) (r2 ^= 19707)))
+ (if (r5 < 7)
+ ((r5 += 1)
+ (repeat))))
+ (repeat))))))
+ nil
+ "The pre-compiled CCL program appears broken, or the implementation
+of `ccl-compile' has changed versus to when this code was written. "))
+ pre-existing))
+ "A CCL program to parse CRC 24 checksums. See `define-ccl-program'.")
- (define-ccl-program pgg-parse-crc24
- '(1
- ((loop
- (read r0) (r1 ^= r0) (r2 ^= 0)
- (r5 = 0)
- (loop
- (r1 <<= 1)
- (r1 += ((r2 >> 15) & 1))
- (r2 <<= 1)
- (if (r1 & 256)
- ((r1 ^= 390) (r2 ^= 19707)))
- (if (r5 < 7)
- ((r5 += 1)
- (repeat))))
- (repeat)))))
+(put 'pgg-parse-crc24 'ccl-program-idx
+ (register-ccl-program 'pgg-parse-crc24 pgg-parse-crc24))
- (defun pgg-parse-crc24-string (string)
+(defun pgg-parse-crc24-string (string)
+ (when (fboundp #'ccl-execute-on-string)
(let ((h (vector nil 183 1230 nil nil nil nil nil nil)))
(ccl-execute-on-string pgg-parse-crc24 h string)
(format "%c%c%c"
--
¿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
[AC pkgs] Retire Skip Montanaro from python-modes
15 years, 11 months
Stephen J. Turnbull
APPROVE COMMIT python-modes
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.774
diff -u -r1.774 ChangeLog
--- ChangeLog 13 Jan 2009 17:24:39 -0000 1.774
+++ ChangeLog 20 Jan 2009 02:05:47 -0000
＠＠ -0,0 +1,5 ＠＠
+2009-01-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * MAINTAINERS: Skip Montanaro retires as python-modes maintainer.
+ Change to XEmacs Development Team.
+
Index: xemacs-packages/python-modes/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/python-modes/ChangeLog,v
retrieving revision 1.26
diff -u -r1.26 ChangeLog
--- xemacs-packages/python-modes/ChangeLog 1 Dec 2008 20:04:23 -0000 1.26
+++ xemacs-packages/python-modes/ChangeLog 20 Jan 2009 02:03:47 -0000
＠＠ -0,0 +1,4 ＠＠
+2009-01-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * Makefile (MAINTAINER): Skip retired, change to XEmacs Dev Team.
+
Index: MAINTAINERS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/MAINTAINERS,v
retrieving revision 1.28
diff -u -r1.28 MAINTAINERS
--- MAINTAINERS 10 Jul 2008 21:07:32 -0000 1.28
+++ MAINTAINERS 20 Jan 2009 02:05:47 -0000
＠＠ -83,7 +83,7 ＠＠
psgml-dtds XEmacs Development Team <xemacs-beta(a)xemacs.org>
psgml XEmacs Development Team <xemacs-beta(a)xemacs.org>
ps-print XEmacs Development Team <xemacs-beta(a)xemacs.org>
-python-modes Skip Montanaro <skip(a)pobox.com>
+python-modes XEmacs Development Team <xemacs-beta(a)xemacs.org>
reftex Carsten Dominik <dominik(a)science.uva.nl>
re-builder Aidan Kehoe <aidan(a)xemacs.org>
riece Daiki Ueno <ueno(a)unixuser.org>
Index: xemacs-packages/python-modes/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/python-modes/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- xemacs-packages/python-modes/Makefile 1 Dec 2008 20:04:23 -0000 1.24
+++ xemacs-packages/python-modes/Makefile 20 Jan 2009 02:03:47 -0000
＠＠ -19,7 +19,7 ＠＠
VERSION = 1.12
AUTHOR_VERSION = 5.0.0
-MAINTAINER = Skip Montanaro <skip(a)pobox.com>
+MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = python-modes
PKG_TYPE = single-file
REQUIRES = xemacs-base mail-lib edit-utils fsf-compat text-modes
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Re: [Q] Some cosmetic namespace cleanup, glyphs.el, coding.el.
15 years, 11 months
Aidan Kehoe
Ar an séú lá déag de mí Eanair, scríobh Stephen J. Turnbull:
> QUERY
>
> Aidan Kehoe writes:
>
> > 2009-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
> >
> > * coding.el (force-coding-system-equivalency):
> > Move three functions that we don't want to advertise to being
> > anonymous lambdas instead.
>
> Would it be possible to use flet instead?
Not in a constructive way, it would be necessary to do #'symbol-function
before the binding went out of scope.
> In general, this kind of patch seems perverse to me. I understand why
> you want to hide the functions (limitation to two namespaces is one
> really sucky thing about Emacs Lisp), but I worry about removing the
> self-documenting aspect of the code, and about things like Lisp
> backtraces.
I’ll give the macro in coding.el a docstring.
Lisp backtraces always show the constants in a compiled function in full, by
the way. So, if handed something that looks like this:
#<compiled-function (symbol) "...(23)" [spec symbol saved-face face-defface-spec reset-face face-display-set nil] 5>
you can grep for 'spec symbol saved-face face-defface-spec reset-face' in,
for example, source-lisp/*.elc , and you’ll get the original function.
--
¿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] Print char table values correctly.
15 years, 11 months
Aidan Kehoe
APPROVE COMMIT
NOTE: this patch has been committed.
With another commit after it to fix the bug in the tests, whoops. 21.4 uses
different, correct, code to print char table values.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1232282993 0
# Node ID 1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7
# Parent 774e5c7522bf0681f0ecf0ab015d9ec8dcb35486
Print char table values correctly.
src/ChangeLog addition:
2009-01-16 Aidan Kehoe <kehoea(a)parhasard.net>
* chartab.c (print_table_entry):
Print char table values correctly, eliminating some confusion
between symbols and strings.
tests/ChangeLog addition:
2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
Check that a bug I fixed in char table printing is really gone.
diff -r 774e5c7522bf -r 1d11ecca9cd0 src/ChangeLog
--- a/src/ChangeLog Tue Jan 13 12:07:27 2009 +0000
+++ b/src/ChangeLog Sun Jan 18 12:49:53 2009 +0000
＠＠ -1,3 +1,9 ＠＠
+2009-01-16 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * chartab.c (print_table_entry):
+ Print char table values correctly, eliminating some confusion
+ between symbols and strings.
+
2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net>
* device-x.c (Fx_get_font_path):
diff -r 774e5c7522bf -r 1d11ecca9cd0 src/chartab.c
--- a/src/chartab.c Tue Jan 13 12:07:27 2009 +0000
+++ b/src/chartab.c Sun Jan 18 12:49:53 2009 +0000
＠＠ -317,7 +317,7 ＠＠
a->first = 0;
lisprange = encode_char_table_range (range);
GCPRO1 (lisprange);
- write_fmt_string_lisp (a->printcharfun, "%s %s", 2, lisprange, val);
+ write_fmt_string_lisp (a->printcharfun, "%s %S", 2, lisprange, val);
UNGCPRO;
return 0;
}
diff -r 774e5c7522bf -r 1d11ecca9cd0 tests/ChangeLog
--- a/tests/ChangeLog Tue Jan 13 12:07:27 2009 +0000
+++ b/tests/ChangeLog Sun Jan 18 12:49:53 2009 +0000
＠＠ -1,3 +1,8 ＠＠
+2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ Check that a bug I fixed in char table printing is really gone.
+
2009-01-11 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el ():
diff -r 774e5c7522bf -r 1d11ecca9cd0 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Tue Jan 13 12:07:27 2009 +0000
+++ b/tests/automated/lisp-tests.el Sun Jan 18 12:49:53 2009 +0000
＠＠ -1327,3 +1327,9 ＠＠
printed-with-uninterned)))
(Assert (null (string-match awkward-regexp printed-with-uninterned
(1+ first-match-start)))))
+
+(let ((char-table-with-string #s(char-table data (?\x00 "text")))
+ (char-table-with-symbol #s(char-table data (?\x00 text))))
+ (Assert (not (string-equal char-table-with-string char-table-with-symbol))
+ "Check that char table elements are quoted correctly when printing"))
+
--
¿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: Fix make check after my last change.
15 years, 11 months
Aidan Kehoe
changeset: 4582:00ed9903a988de9a983c074bf0abdc667639eeaf
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Jan 18 12:56:51 2009 +0000
files: tests/ChangeLog tests/automated/lisp-tests.el
description:
Fix make check after my last change.
2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el: (char-table-with-string):
That was remiss of me, I should have checked before commiting that
last changed. Fixed, the char tables are now actually printed.
diff -r c02fdef8db8bb4fdb7c9e503d12bd5b56181c037 -r 00ed9903a988de9a983c074bf0abdc667639eeaf tests/ChangeLog
--- a/tests/ChangeLog Sun Jan 18 12:51:25 2009 +0000
+++ b/tests/ChangeLog Sun Jan 18 12:56:51 2009 +0000
＠＠ -1,3 +1,9 ＠＠ 2009-01-18 Aidan Kehoe <kehoea＠parhasa
+2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el: (char-table-with-string):
+ That was remiss of me, I should have checked before commiting that
+ last changed. Fixed, the char tables are now actually printed.
+
2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
diff -r c02fdef8db8bb4fdb7c9e503d12bd5b56181c037 -r 00ed9903a988de9a983c074bf0abdc667639eeaf tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Sun Jan 18 12:51:25 2009 +0000
+++ b/tests/automated/lisp-tests.el Sun Jan 18 12:56:51 2009 +0000
＠＠ -1330,6 +1330,7 ＠＠
(let ((char-table-with-string #s(char-table data (?\x00 "text")))
(char-table-with-symbol #s(char-table data (?\x00 text))))
- (Assert (not (string-equal char-table-with-string char-table-with-symbol))
+ (Assert (not (string-equal (prin1-to-string char-table-with-string)
+ (prin1-to-string char-table-with-symbol)))
"Check that char table elements are quoted correctly when printing"))
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Print char table values correctly.
15 years, 11 months
Aidan Kehoe
changeset: 4580:1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7
parent: 4576:774e5c7522bf0681f0ecf0ab015d9ec8dcb35486
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Jan 18 12:49:53 2009 +0000
files: src/ChangeLog src/chartab.c tests/ChangeLog tests/automated/lisp-tests.el
description:
Print char table values correctly.
src/ChangeLog addition:
2009-01-16 Aidan Kehoe <kehoea(a)parhasard.net>
* chartab.c (print_table_entry):
Print char table values correctly, eliminating some confusion
between symbols and strings.
tests/ChangeLog addition:
2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el:
Check that a bug I fixed in char table printing is really gone.
diff -r 774e5c7522bf0681f0ecf0ab015d9ec8dcb35486 -r 1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7 src/ChangeLog
--- a/src/ChangeLog Tue Jan 13 12:07:27 2009 +0000
+++ b/src/ChangeLog Sun Jan 18 12:49:53 2009 +0000
＠＠ -1,3 +1,9 ＠＠ 2008-12-30 Aidan Kehoe <kehoea＠parhasa
+2009-01-16 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * chartab.c (print_table_entry):
+ Print char table values correctly, eliminating some confusion
+ between symbols and strings.
+
2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net>
* device-x.c (Fx_get_font_path):
diff -r 774e5c7522bf0681f0ecf0ab015d9ec8dcb35486 -r 1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7 src/chartab.c
--- a/src/chartab.c Tue Jan 13 12:07:27 2009 +0000
+++ b/src/chartab.c Sun Jan 18 12:49:53 2009 +0000
＠＠ -317,7 +317,7 ＠＠ print_table_entry (struct chartab_range
a->first = 0;
lisprange = encode_char_table_range (range);
GCPRO1 (lisprange);
- write_fmt_string_lisp (a->printcharfun, "%s %s", 2, lisprange, val);
+ write_fmt_string_lisp (a->printcharfun, "%s %S", 2, lisprange, val);
UNGCPRO;
return 0;
}
diff -r 774e5c7522bf0681f0ecf0ab015d9ec8dcb35486 -r 1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7 tests/ChangeLog
--- a/tests/ChangeLog Tue Jan 13 12:07:27 2009 +0000
+++ b/tests/ChangeLog Sun Jan 18 12:49:53 2009 +0000
＠＠ -1,3 +1,8 ＠＠ 2009-01-11 Aidan Kehoe <kehoea＠parhasa
+2009-01-18 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/lisp-tests.el:
+ Check that a bug I fixed in char table printing is really gone.
+
2009-01-11 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/lisp-tests.el ():
diff -r 774e5c7522bf0681f0ecf0ab015d9ec8dcb35486 -r 1d11ecca9cd06c9151cb69e55ccc2ebbd998d9b7 tests/automated/lisp-tests.el
--- a/tests/automated/lisp-tests.el Tue Jan 13 12:07:27 2009 +0000
+++ b/tests/automated/lisp-tests.el Sun Jan 18 12:49:53 2009 +0000
＠＠ -1327,3 +1327,9 ＠＠
printed-with-uninterned)))
(Assert (null (string-match awkward-regexp printed-with-uninterned
(1+ first-match-start)))))
+
+(let ((char-table-with-string #s(char-table data (?\x00 "text")))
+ (char-table-with-symbol #s(char-table data (?\x00 text))))
+ (Assert (not (string-equal char-table-with-string char-table-with-symbol))
+ "Check that char table elements are quoted correctly when printing"))
+
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[COMMIT] Re: [Bug: 21.5-b28] Crash when printing
15 years, 11 months
Aidan Kehoe
APPROVE COMMIT
NOTE; this patch has been committed.
Olle didn’t get back to me, but the change seems sane enough.
Ar an deichiú lá de mí Eanair, scríobh Aidan Kehoe:
>
> Thank you Olle, I can reproduce the crash without problems with that recipe.
> Here’s a patch that addresses it for me; please check if it works for you.
>
> diff -r 8418d1ad4944 src/ChangeLog
> --- a/src/ChangeLog Sun Nov 02 00:34:13 2008 +0900
> +++ b/src/ChangeLog Sat Jan 10 22:50:17 2009 +0000
> ＠＠ -1,3 +1,8 ＠＠
> +2009-01-10 Aidan Kehoe <kehoea(a)parhasard.net>
> +
> + * objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
> + Accept msprinter as well as mswindows devices here.
> +
> 2008-11-01 Stephen J. Turnbull <stephen(a)xemacs.org>
>
> * regex.c (re_search_2): Fix at_dot by changing charpos to bytepos.
> diff -r 8418d1ad4944 src/objects-msw.c
> --- a/src/objects-msw.c Sun Nov 02 00:34:13 2008 +0900
> +++ b/src/objects-msw.c Sat Jan 10 22:50:17 2009 +0000
> ＠＠ -2064,8 +2064,21 ＠＠
> else
> {
> HDC hdc = CreateCompatibleDC (NULL);
> - Lisp_Object font_list = DEVICE_MSWINDOWS_FONTLIST (d);
> - Lisp_Object truename;
> + Lisp_Object font_list = Qnil, truename;
> +
> + if (DEVICE_TYPE_P (d, mswindows))
> + {
> + font_list = DEVICE_MSWINDOWS_FONTLIST (d);
> + }
> + else if (DEVICE_TYPE_P (d, msprinter))
> + {
> + font_list = DEVICE_MSPRINTER_FONTLIST (d);
> + }
> + else
> + {
> + assert(0);
> + }
> +
> HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil,
> font_list,
> ERROR_ME_DEBUG_WARN,
>
--
¿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: Accept msprinter and mswindows, mswindows_font_spec_matches_charset_stage_2
15 years, 11 months
Aidan Kehoe
changeset: 4579:68f74b080e9421c23fc2b7d36809d46a1ff02a40
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Jan 18 12:41:58 2009 +0000
files: src/ChangeLog src/objects-msw.c
description:
Accept msprinter and mswindows, mswindows_font_spec_matches_charset_stage_2
src/ChangeLog addition:
2009-01-10 Aidan Kehoe <kehoea(a)parhasard.net>
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
Accept msprinter as well as mswindows devices here.
diff -r 49e17f7182f51df9b27d02a74b5433b1654aa3a1 -r 68f74b080e9421c23fc2b7d36809d46a1ff02a40 src/ChangeLog
--- a/src/ChangeLog Sun Jan 18 12:14:19 2009 +0200
+++ b/src/ChangeLog Sun Jan 18 12:41:58 2009 +0000
＠＠ -1,3 +1,8 ＠＠ 2008-12-30 Aidan Kehoe <kehoea＠parhasa
+2009-01-10 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
+ Accept msprinter as well as mswindows devices here.
+
2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net>
* device-x.c (Fx_get_font_path):
diff -r 49e17f7182f51df9b27d02a74b5433b1654aa3a1 -r 68f74b080e9421c23fc2b7d36809d46a1ff02a40 src/objects-msw.c
--- a/src/objects-msw.c Sun Jan 18 12:14:19 2009 +0200
+++ b/src/objects-msw.c Sun Jan 18 12:41:58 2009 +0000
＠＠ -2064,8 +2064,21 ＠＠ mswindows_font_spec_matches_charset_stag
else
{
HDC hdc = CreateCompatibleDC (NULL);
- Lisp_Object font_list = DEVICE_MSWINDOWS_FONTLIST (d);
- Lisp_Object truename;
+ Lisp_Object font_list = Qnil, truename;
+
+ if (DEVICE_TYPE_P (d, mswindows))
+ {
+ font_list = DEVICE_MSWINDOWS_FONTLIST (d);
+ }
+ else if (DEVICE_TYPE_P (d, msprinter))
+ {
+ font_list = DEVICE_MSPRINTER_FONTLIST (d);
+ }
+ else
+ {
+ assert(0);
+ }
+
HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil,
font_list,
ERROR_ME_DEBUG_WARN,
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches