From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/64205 Path: news.gmane.org!not-for-mail From: Steve Youngs Newsgroups: gmane.emacs.gnus.general Subject: [PATCH] Fix gnus-message-citation-mode for (S)XEmacs Date: Sun, 31 Dec 2006 17:18:10 +1000 Organization: The SXEmacs Project Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: sea.gmane.org 1167549571 17110 80.91.229.12 (31 Dec 2006 07:19:31 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 31 Dec 2006 07:19:31 +0000 (UTC) Keywords: lisp,gnus-message-citation-mode,nil,gnus-cite,xemacs,gnus-msg,diff,changelog,gnus,dec,require,patch Original-X-From: ding-owner+M12728@lists.math.uh.edu Sun Dec 31 08:19:30 2006 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.50) id 1H0uyc-00019U-K8 for ding-account@gmane.org; Sun, 31 Dec 2006 08:19:27 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1H0uxh-0001a3-Fb; Sun, 31 Dec 2006 01:18:29 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1H0uxf-0001Zk-RC for ding@lists.math.uh.edu; Sun, 31 Dec 2006 01:18:27 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.63) (envelope-from ) id 1H0uxd-0004xf-9q for ding@lists.math.uh.edu; Sun, 31 Dec 2006 01:18:27 -0600 Original-Received: from 203-206-170-37.perm.iinet.net.au ([203.206.170.37] helo=bastard.youngs.au.com) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1H0uxb-00050Q-00 for ; Sun, 31 Dec 2006 08:18:23 +0100 Original-Received: from bastard.youngs.au.com (localhost [127.0.0.1]) by bastard.youngs.au.com (8.13.6/8.13.6) with ESMTP id kBV7IDn3009613 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 31 Dec 2006 17:18:13 +1000 Original-Received: (from steve@localhost) by bastard.youngs.au.com (8.13.6/8.13.6/Submit) id kBV7ICwC009612; Sun, 31 Dec 2006 17:18:12 +1000 Original-To: Gnus List X-Face: #O)>9erkUv7RJ~0G~5_6lEMz\HC2&~&kV2bsu4TWHI_v~<8Hj%KBBj1[*\uKF*dxbEzwAli ;tSuN`c)F,}p|7{6lA~e.P+7Qo\A%q"lJ7/UtUX@yEZ!X"Tph(3O8`nhPJF>hI4_GOvb%X{+e*Mi_| ^yTf#aTwGG,(3e41?C9B7Pak*'A$+$/hV Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAD1BMVEUpHB9XSkr8+87BuKOK f3UUQ+/kAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAwAAAAMADO7oxXAAAB2ElEQVQ4 y3WU2XHDMAxEgYkKAEQWYIsuwJZcgCiy/5qCBanDEweTjwyeiMVpmv4x+uNJ01TLFSy7OwnReIJ5 /+fNwqqfoVKtmVgo1jxfwUIwiarLB3iIBSfOaha3E0AToMoQcoBGk00rOWEiezE38WTsSepAh5U1 tjrgf5gmvh+yJabbWWCW6NIhR2UdAZJnlBHFQNQY8x7KrKwGBnHhbRJNHaTspSGYWAxSf2GxXk98 S+x/08qHeJXWCnuj+UVWRgeFmKOI/tysJaRhH5RJcI2aeUuIVbepV/5+eu8YDbAS4zHaAu2Vwxvz sLy2DlLxZKkZkg79hdLF/IP5C3AbvwIlCQ3IRyjbBvqZKJn2engZA1+hTr2BJ8nBHBsAJnNBuVQt yOouvYSuZKvTKr+j4S0ZWMSKOLgpiwjzntpafLdperDtjVLsgNHzuQO1aFnavg3zfjh3dWtJs5S+ sMjK3NITQF/btUAcdWgPdLnBl/kxcQfzcV1kyym4Lb0EmnxLXEDbizOSgSeJMmWcnvDoNTTxu7YF xDFpuL7QvRtaJR5nbZtqc/HGC1e7vXYWaImwbQyDCcexpYSsHqZsBF2puI15bldpAPkaiLXWpUdq u5uW8i5my8evxy//Lmnk+o0s9wAAABp6VFh0SlBFRy1Db2xvcnNwYWNlAAB42jMCAAAzADMRFn5j AAAAJ3pUWHRKUEVHLVNhbXBsaW5nLWZhY3RvcnMAAHjaM6ow0jGsMARhABGDAulkDxtiAAAAAElF TkSuQmCC Mail-Copies-To: never X-X-Day: Only 2430511 days till X-Day. Got Slack? X-URL: X-Request-PGP: X-OpenPGP-Fingerprint: 1659 2093 19D5 C06E D320 3A20 1D27 DB4B A94B 3003 X-Now-Playing: Drive --- [Incubus] X-Discordian-Date: Setting Orange, the 73rd day of The Aftermath, 3172. X-Attribution: SY X-Arch-Repo: steve@sxemacs.org--2007 http://arch.sxemacs.org/2007/ X-Generated-By: Patcher version 3.8 Mail-Followup-To: Gnus List User-Agent: Gnus/5.110006 (No Gnus v0.6) SXEmacs/22.1.7 (De Lorean, linux) X-Spam-Score: -2.5 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:64205 Archived-At: --=-=-= Content-Transfer-Encoding: quoted-printable This fixes a problem reported by Norbert Koch and Nelson Ferreira in regards to `gnus-message-citation-mode' and (S)XEmacs. Reiner, I guess your solution fixed it too, but this one doesn't just turn it off for (S)XEmacs. :-) Hope you don't mind. NOTE: This patch has been committed. Gnus patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: lisp/ChangeLog Source files diff command: cvs -q diff -uN Files affected: lisp/gnus-msg.el lisp/gnus-cite.el Index: lisp/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v retrieving revision 7.1454 diff -u -p -U0 -r7.1454 ChangeLog =2D-- lisp/ChangeLog 31 Dec 2006 00:57:08 -0000 7.1454 +++ lisp/ChangeLog 31 Dec 2006 07:14:47 -0000 @@ -0,0 +1,13 @@ +2006-12-31 Steve Youngs + + * gnus-cite.el: Load easy-mmode at compile time for (S)XEmacs to get + `define-minor-mode' macro definition expanded properly. + (gnus-message-citation-mode): This is now OK for (S)XEmacs so don't + exclude it there. + + * gnus-msg.el (gnus-message-highlight-citation): Revert Reiner's patch + of 2006-12-30. The default is nil on (S)XEmacs already because of the + `fboundp' test. + (gnus-message-citation-mode): Revert Reiner's patch of 2006-12-30. + This is OK to autoload in (S)XEmacs now. + Index: lisp/gnus-cite.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/local/cvsroot/gnus/lisp/gnus-cite.el,v retrieving revision 7.21 diff -u -p -u -r7.21 gnus-cite.el =2D-- lisp/gnus-cite.el 30 Dec 2006 21:03:37 -0000 7.21 +++ lisp/gnus-cite.el 31 Dec 2006 07:14:42 -0000 @@ -27,6 +27,9 @@ ;;; Code: =20 (eval-when-compile (require 'cl)) +(eval-when-compile + (when (featurep 'xemacs) + (require 'easy-mmode))) ; for `define-minor-mode' =20 (require 'gnus) (require 'gnus-range) @@ -1159,20 +1162,19 @@ Returns nil if there is no such line bef (font-lock-remove-keywords nil gnus-message-citation-keywords) (gnus-message 1 "`font-lock-remove-keywords' not supported."))) =20 =2D(unless (featurep 'xemacs) =2D (define-minor-mode gnus-message-citation-mode =2D "Toggle `gnus-message-citation-mode' in current buffer. +(define-minor-mode gnus-message-citation-mode + "Toggle `gnus-message-citation-mode' in current buffer. This buffer local minor mode provides additional font-lock support for nested citations. With prefix ARG, turn `gnus-message-citation-mode' on if and only if ARG is positive." =2D nil ;; init-value =2D "" ;; lighter =2D nil ;; keymap =2D (if gnus-message-citation-mode =2D (gnus-message-add-citation-keywords) =2D (gnus-message-remove-citation-keywords)) =2D (font-lock-fontify-buffer))) + nil ;; init-value + "" ;; lighter + nil ;; keymap + (if gnus-message-citation-mode + (gnus-message-add-citation-keywords) + (gnus-message-remove-citation-keywords)) + (font-lock-fontify-buffer)) =20 (defun turn-on-gnus-message-citation-mode () "Turn on `gnus-message-citation-mode'." Index: lisp/gnus-msg.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/local/cvsroot/gnus/lisp/gnus-msg.el,v retrieving revision 7.44 diff -u -p -u -r7.44 gnus-msg.el =2D-- lisp/gnus-msg.el 30 Dec 2006 13:50:57 -0000 7.44 +++ lisp/gnus-msg.el 31 Dec 2006 07:14:42 -0000 @@ -290,8 +290,7 @@ If nil, the address field will always be :type 'boolean) =20 (defcustom gnus-message-highlight-citation =2D (and (not (featurep 'xemacs)) =2D ;; gnus-treat-highlight-citation ;; gnus-cite dependency + (and t ;; gnus-treat-highlight-citation ;; gnus-cite dependency (fboundp 'font-lock-add-keywords)) "Enable highlighting of different citation levels in message-mode." :version "23.0" ;; No Gnus @@ -299,8 +298,7 @@ If nil, the address field will always be :group 'gnus-message :type 'boolean) =20 =2D(unless (featurep 'xemacs) =2D (autoload 'gnus-message-citation-mode "gnus-cite" nil t)) +(autoload 'gnus-message-citation-mode "gnus-cite" nil t) =20 ;;; Internal variables. =20 =2D-=20 |---------------------| | SXEmacs - The only _______ you'll ever need. | | Fill in the blank, yes, it's THAT good! | |---------------------------------------| --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) Comment: The SXEmacs Project Comment: Eicq - The SXEmacs ICQ Client iEYEARECAAYFAkWXZDIACgkQHSfbS6lLMAN1TQCfUDm5b9cI1k2TXDFwv7H/wl3z 830An3HtrKQq6uREsZMsqf3tuV9NI480 =Fg5E -----END PGP SIGNATURE----- --=-=-=--