[PATCH] Support opaque display-table objects on XEmacs (revised)
This supersedes the patch in 18492.30425.377545.700503(a)parhasard.net, taking
on board Reiner’s input. Tested with XEmacs 21.5; the other
incompatibilities there are independent of this.
lisp/ChangeLog addition:
2008-05-22 Aidan Kehoe <kehoea(a)parhasard.net>
* gnus-util.el (gnus-put-display-table): New.
(gnus-get-display-table): New.
Macros that expand to an `aset' call under GNU, and to a runtime choice
under XEmacs.
* gnus-sum.el (gnus-summary-set-display-table):
Use `gnus-put-display-table', `gnus-get-display-table',
`gnus-set-display-table' for the display table, instead of `aset';
* gnus-xmas.el (gnus-xmas-summary-set-display-table):
Use `gnus-put-display-table', `gnus-get-display-table',
`gnus-set-display-table' for the display table.
Index: lisp/gnus-sum.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-sum.el,v
retrieving revision 7.227
diff -u -u -r7.227 gnus-sum.el
--- lisp/gnus-sum.el 24 May 2008 13:06:11 -0000 7.227
+++ lisp/gnus-sum.el 9 Jun 2008 20:00:15 -0000
＠＠ -3419,13 +3419,13 ＠＠
(i 32))
;; Nix out all the control chars...
(while (>= (setq i (1- i)) 0)
- (aset table i [??]))
+ (gnus-put-display-table i [??] table))
;; ... but not newline and cr, of course. (cr is necessary for the
;; selective display).
- (aset table ?\n nil)
- (aset table ?\r nil)
+ (gnus-put-display-table ?\n nil table)
+ (gnus-put-display-table ?\r nil table)
;; We keep TAB as well.
- (aset table ?\t nil)
+ (gnus-put-display-table ?\t nil table)
;; We nix out any glyphs 127 through 255, or 127 through 159 in
;; Emacs 23 (unicode), that are not set already.
(let ((i (if (ignore-errors (= (make-char 'latin-iso8859-1 160) 160))
＠＠ -3433,8 +3433,8 ＠＠
256)))
(while (>= (setq i (1- i)) 127)
;; Only modify if the entry is nil.
- (unless (aref table i)
- (aset table i [??]))))
+ (unless (gnus-get-display-table i table)
+ (gnus-put-display-table i [??] table))))
(setq buffer-display-table table)))
(defun gnus-summary-set-article-display-arrow (pos)
Index: lisp/gnus-util.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-util.el,v
retrieving revision 7.80
diff -u -u -r7.80 gnus-util.el
--- lisp/gnus-util.el 19 May 2008 08:47:42 -0000 7.80
+++ lisp/gnus-util.el 9 Jun 2008 20:00:15 -0000
＠＠ -1798,6 +1798,27 ＠＠
;; that intends to handle the quit signal next time.
(eval '(ignore nil))))))
+(defmacro gnus-put-display-table (range value display-table)
+ "Set the value for char RANGE to VALUE in DISPLAY-TABLE. "
+ (if (featurep 'xemacs)
+ (progn
+ `(if (fboundp 'put-display-table)
+ (put-display-table ,range ,value ,display-table)
+ (if (sequencep ,display-table)
+ (aset ,display-table ,range ,value)
+ (put-char-table ,range ,value ,display-table))))
+ `(aset ,display-table ,range ,value)))
+
+(defmacro gnus-get-display-table (character display-table)
+ "Find value for CHARACTER in DISPLAY-TABLE. "
+ (if (featurep 'xemacs)
+ `(if (fboundp 'get-display-table)
+ (get-display-table ,character ,display-table)
+ (if (sequencep ,display-table)
+ (aref ,display-table ,character)
+ (get-char-table ,character ,display-table)))
+ `(aref ,display-table ,char-table)))
+
(provide 'gnus-util)
;; arch-tag: f94991af-d32b-4c97-8c26-ca12a934de49
Index: lisp/gnus-xmas.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-xmas.el,v
retrieving revision 7.25
diff -u -u -r7.25 gnus-xmas.el
--- lisp/gnus-xmas.el 10 Mar 2008 00:53:11 -0000 7.25
+++ lisp/gnus-xmas.el 9 Jun 2008 20:00:15 -0000
＠＠ -39,6 +39,7 ＠＠
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
(require 'wid-edit)
+(require 'gnus-util)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
＠＠ -173,18 +174,18 ＠＠
(i 32))
;; Nix out all the control chars...
(while (>= (setq i (1- i)) 0)
- (aset table i [??]))
+ (gnus-put-display-table i [??] table))
;; ... but not newline and cr, of course. (cr is necessary for the
;; selective display).
- (aset table ?\n nil)
- (aset table ?\r nil)
+ (gnus-put-display-table ?\n nil table)
+ (gnus-put-display-table ?\r nil table)
;; We keep TAB as well.
- (aset table ?\t nil)
+ (gnus-put-display-table ?\t nil table)
;; We nix out any glyphs over 126 below ctl-arrow.
(let ((i (if (integerp ctl-arrow) ctl-arrow 160)))
(while (>= (setq i (1- i)) 127)
- (unless (aref table i)
- (aset table i [??]))))
+ (unless (gnus-get-display-table i table)
+ (gnus-put-display-table i [??] table))))
;; Can't use `set-specifier' because of a bug in 19.14 and earlier
(add-spec-to-specifier current-display-table table (current-buffer) nil)))
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, 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