From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/10830 Path: main.gmane.org!not-for-mail From: Steven L Baur Newsgroups: gmane.emacs.gnus.general Subject: Re: X-Face displayed before the From header Date: 28 Apr 1997 14:45:43 -0700 Message-ID: References: NNTP-Posting-Host: coloc-standby.netfonds.no Mime-Version: 1.0 (generated by tm-edit 7.106) Content-Type: multipart/mixed; boundary="Multipart_Mon_Apr_28_14:45:42_1997-1" Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1035150637 26673 80.91.224.250 (20 Oct 2002 21:50:37 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Sun, 20 Oct 2002 21:50:37 +0000 (UTC) Return-Path: Original-Received: from riker.diamond-lane.net (root@riker [206.190.83.4]) by deanna.miranova.com (8.8.5/8.8.5) with ESMTP id PAA01687 for ; Mon, 28 Apr 1997 15:03:38 -0700 Original-Received: from ifi.uio.no (0@ifi.uio.no [129.240.64.2]) by riker.diamond-lane.net (8.8.5/8.8.5) with SMTP id PAA26384 for ; Mon, 28 Apr 1997 15:21:01 -0700 Original-Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19]) by ifi.uio.no with ESMTP (8.6.11/ifi2.4) id for ; Mon, 28 Apr 1997 23:33:50 +0200 Original-Received: (from steve@localhost) by altair.xemacs.org (8.8.5/8.8.5) id OAA09930; Mon, 28 Apr 1997 14:45:45 -0700 Mail-Copies-To: never Original-To: ding@ifi.uio.no X-Url: http://www.miranova.com/%7Esteve/ X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5" f8*@r4ipO6Jl!:Ccqp:9I OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+ X-Attribution: sb In-Reply-To: Hrvoje Niksic's message of 28 Apr 1997 22:47:05 +0200 Original-Lines: 335 X-Mailer: Gnus v5.4.48/XEmacs 20.2(beta4) Xref: main.gmane.org gmane.emacs.gnus.general:10830 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:10830 --Multipart_Mon_Apr_28_14:45:42_1997-1 Content-Type: text/plain; charset=US-ASCII Hrvoje Niksic writes: > jason@mastaler.com (Jason R. Mastaler) writes: >> I'd like the X-Face to be displayed before the From header in a >> message instead of by forking of an xv to view the face like Gnus does >> now (with 5.4.48 and XEmacs 19.15). This is strange because the 5.4.48 >> manual says "under XEmacs the default action is to display the face >> before the From header." I haven't changed anything to alter the >> default. > Have you built XEmacs with the `--with-xface' included? You must also > have the compface libraries to do this. I think this is related to the bad patch I posted that got included in Gnus 5.4.48. At least I saw the same behavior. Revert your copy of gnus-xmas.el to the one included with Gnus-5.4.46 and all should be well. --Multipart_Mon_Apr_28_14:45:42_1997-1 Content-Type: message/rfc822 X-From-Line: nobody Sun Apr 27 15:33:02 1997 To: bugs@gnus.org (The Gnus Bugfixing Girls + Boys) Subject: Kinder, gentler gnus-xmas.el fix for circular dependency X-Url: http://www.miranova.com/%7Esteve/ X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5" f8*@r4ipO6Jl!:Ccqp:9I OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+ X-Attribution: sb From: Steven L Baur Gcc: nnfolder+archive:misc-mail Mime-Version: 1.0 (generated by tm-edit 7.106) Content-Type: multipart/mixed; boundary="Multipart_Sun_Apr_27_15:33:00_1997-1" Content-Transfer-Encoding: 7bit Date: 27 Apr 1997 15:33:01 -0700 Message-ID: X-Mailer: Gnus v5.4.48/XEmacs 20.2(beta4) Lines: 558 Xref: altair.xemacs.org gnus-bug:1041 --Multipart_Sun_Apr_27_15:33:00_1997-1 Content-Type: text/plain; charset=US-ASCII Gnus v5.4.48; nntp 5.0; nnml 1.0; nndoc 1.0; nnfolder 1.0 XEmacs 20.2 [Lucid] (i586-unknown-linux2.0.30, Mule) of Sun Apr 27 1997 on altair.xemacs.org 200 zinger.callamer.com InterNetNews NNRP server INN 1.5.1 17-Dec-1996 ready (posting ok). I can't see any reason off-hand why the (require 'gnus-art) needs to be in there at all. This patch restores the Gnus-5.4.46 version which seemed to work well. --- ChangeLog~ Sun Apr 27 15:15:38 1997 +++ ChangeLog Sun Apr 27 15:16:47 1997 @@ -1,3 +1,8 @@ +Sun Apr 27 15:16:16 1997 Steven L Baur + + * gnus-xmas.el: Undo previous change, and restore the version from + 5.4.46 (without the require 'gnus-art). + Sun Apr 27 23:15:58 1997 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.4.48 is released. =================================================================== RCS file: RCS/gnus-xmas.el,v retrieving revision 1.18 diff -u -r1.18 gnus-xmas.el --- gnus-xmas.el 1997/04/27 22:11:46 1.18 +++ gnus-xmas.el 1997/04/27 22:12:39 @@ -29,126 +29,6 @@ (defvar menu-bar-mode (featurep 'menubar)) (require 'messagexmas) -(defun gnus-xmas-redefine () - "Redefine lots of Gnus functions for XEmacs." - (fset 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table) - (fset 'gnus-visual-turn-off-edit-menu 'identity) - (fset 'gnus-summary-recenter 'gnus-xmas-summary-recenter) - (fset 'gnus-extent-start-open 'gnus-xmas-extent-start-open) - (fset 'gnus-article-push-button 'gnus-xmas-article-push-button) - (fset 'gnus-article-add-button 'gnus-xmas-article-add-button) - (fset 'gnus-window-top-edge 'gnus-xmas-window-top-edge) - (fset 'gnus-read-event-char 'gnus-xmas-read-event-char) - (fset 'gnus-group-startup-message 'gnus-xmas-group-startup-message) - (fset 'gnus-tree-minimize 'gnus-xmas-tree-minimize) - (fset 'gnus-appt-select-lowest-window - 'gnus-xmas-appt-select-lowest-window) - (fset 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names) - (fset 'gnus-character-to-event 'character-to-event) - (fset 'gnus-mode-line-buffer-identification - 'gnus-xmas-mode-line-buffer-identification) - (fset 'gnus-key-press-event-p 'key-press-event-p) - (fset 'gnus-region-active-p 'region-active-p) - - (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add) - (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add) - (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add) - (add-hook 'gnus-score-mode-hook 'gnus-xmas-score-menu-add) - - (add-hook 'gnus-pick-mode-hook 'gnus-xmas-pick-menu-add) - (add-hook 'gnus-topic-mode-hook 'gnus-xmas-topic-menu-add) - (add-hook 'gnus-tree-mode-hook 'gnus-xmas-tree-menu-add) - (add-hook 'gnus-binary-mode-hook 'gnus-xmas-binary-menu-add) - (add-hook 'gnus-grouplens-mode-hook 'gnus-xmas-grouplens-menu-add) - (add-hook 'gnus-server-mode-hook 'gnus-xmas-server-menu-add) - (add-hook 'gnus-browse-mode-hook 'gnus-xmas-browse-menu-add) - - (add-hook 'gnus-group-mode-hook 'gnus-xmas-setup-group-toolbar) - (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar) - - (add-hook 'gnus-summary-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off) - - (when (and (<= emacs-major-version 19) - (<= emacs-minor-version 13)) - (setq gnus-article-x-face-too-ugly (when (eq (device-type) 'tty) - ".")) - (fset 'gnus-highlight-selected-summary - 'gnus-xmas-highlight-selected-summary) - (fset 'gnus-group-remove-excess-properties - 'gnus-xmas-group-remove-excess-properties) - (fset 'gnus-topic-remove-excess-properties - 'gnus-xmas-topic-remove-excess-properties) - (fset 'gnus-mode-line-buffer-identification 'identity) - (unless (boundp 'shell-command-switch) - (setq shell-command-switch "-c")))) - -(defun gnus-xmas-define () - (setq gnus-mouse-2 [button2]) - - (unless (memq 'underline (face-list)) - (and (fboundp 'make-face) - (funcall (intern "make-face") 'underline))) - ;; Must avoid calling set-face-underline-p directly, because it - ;; is a defsubst in emacs19, and will make the .elc files non - ;; portable! - (unless (face-differs-from-default-p 'underline) - (funcall (intern "set-face-underline-p") 'underline t)) - - (cond - ((fboundp 'char-or-char-int-p) - ;; Handle both types of marks for XEmacs-20.x. - (fset 'gnus-characterp 'char-or-char-int-p)) - ;; V19 of XEmacs, probably. - (t - (fset 'gnus-characterp 'characterp))) - - (fset 'gnus-make-overlay 'make-extent) - (fset 'gnus-overlay-put 'set-extent-property) - (fset 'gnus-move-overlay 'gnus-xmas-move-overlay) - (fset 'gnus-overlay-end 'extent-end-position) - (fset 'gnus-extent-detached-p 'extent-detached-p) - (fset 'gnus-add-text-properties 'gnus-xmas-add-text-properties) - (fset 'gnus-put-text-property 'gnus-xmas-put-text-property) - - (require 'text-props) - (if (and (<= emacs-major-version 19) - (< emacs-minor-version 14)) - (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties)) - - (when (fboundp 'turn-off-scroll-in-place) - (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place)) - - (unless (boundp 'standard-display-table) - (setq standard-display-table nil)) - - (defvar gnus-mouse-face-prop 'highlight) - - (unless (fboundp 'encode-time) - (defun encode-time (sec minute hour day month year &optional zone) - (let ((seconds - (gnus-xmas-seconds-since-epoch - (timezone-make-arpa-date - year month day (timezone-make-time-string hour minute sec) - zone)))) - (list (floor (/ seconds (expt 2 16))) - (round (mod seconds (expt 2 16))))))) - - (defun gnus-byte-code (func) - "Return a form that can be `eval'ed based on FUNC." - (let ((fval (symbol-function func))) - (if (compiled-function-p fval) - (list 'funcall fval) - (cons 'progn (cdr (cdr fval)))))) - - (fset 'gnus-x-color-values - (if (fboundp 'x-color-values) - 'x-color-values - (lambda (color) - (color-instance-rgb-components - (make-color-instance color)))))) - -(require 'gnus-art) ;; Circular - (defgroup gnus-xmas nil "XEmacsoid support for Gnus" :group 'gnus) @@ -525,6 +405,125 @@ (* (nth 1 ttime) 60) (* (float (nth 0 ttime)) 60 60) (* (float tday) 60 60 24)))) + +(defun gnus-xmas-define () + (setq gnus-mouse-2 [button2]) + + (unless (memq 'underline (face-list)) + (and (fboundp 'make-face) + (funcall (intern "make-face") 'underline))) + ;; Must avoid calling set-face-underline-p directly, because it + ;; is a defsubst in emacs19, and will make the .elc files non + ;; portable! + (unless (face-differs-from-default-p 'underline) + (funcall (intern "set-face-underline-p") 'underline t)) + + (cond + ((fboundp 'char-or-char-int-p) + ;; Handle both types of marks for XEmacs-20.x. + (fset 'gnus-characterp 'char-or-char-int-p)) + ;; V19 of XEmacs, probably. + (t + (fset 'gnus-characterp 'characterp))) + + (fset 'gnus-make-overlay 'make-extent) + (fset 'gnus-overlay-put 'set-extent-property) + (fset 'gnus-move-overlay 'gnus-xmas-move-overlay) + (fset 'gnus-overlay-end 'extent-end-position) + (fset 'gnus-extent-detached-p 'extent-detached-p) + (fset 'gnus-add-text-properties 'gnus-xmas-add-text-properties) + (fset 'gnus-put-text-property 'gnus-xmas-put-text-property) + + (require 'text-props) + (if (and (<= emacs-major-version 19) + (< emacs-minor-version 14)) + (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties)) + + (when (fboundp 'turn-off-scroll-in-place) + (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place)) + + (unless (boundp 'standard-display-table) + (setq standard-display-table nil)) + + (defvar gnus-mouse-face-prop 'highlight) + + (unless (fboundp 'encode-time) + (defun encode-time (sec minute hour day month year &optional zone) + (let ((seconds + (gnus-xmas-seconds-since-epoch + (timezone-make-arpa-date + year month day (timezone-make-time-string hour minute sec) + zone)))) + (list (floor (/ seconds (expt 2 16))) + (round (mod seconds (expt 2 16))))))) + + (defun gnus-byte-code (func) + "Return a form that can be `eval'ed based on FUNC." + (let ((fval (symbol-function func))) + (if (compiled-function-p fval) + (list 'funcall fval) + (cons 'progn (cdr (cdr fval)))))) + + (fset 'gnus-x-color-values + (if (fboundp 'x-color-values) + 'x-color-values + (lambda (color) + (color-instance-rgb-components + (make-color-instance color)))))) + +(defun gnus-xmas-redefine () + "Redefine lots of Gnus functions for XEmacs." + (fset 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table) + (fset 'gnus-visual-turn-off-edit-menu 'identity) + (fset 'gnus-summary-recenter 'gnus-xmas-summary-recenter) + (fset 'gnus-extent-start-open 'gnus-xmas-extent-start-open) + (fset 'gnus-article-push-button 'gnus-xmas-article-push-button) + (fset 'gnus-article-add-button 'gnus-xmas-article-add-button) + (fset 'gnus-window-top-edge 'gnus-xmas-window-top-edge) + (fset 'gnus-read-event-char 'gnus-xmas-read-event-char) + (fset 'gnus-group-startup-message 'gnus-xmas-group-startup-message) + (fset 'gnus-tree-minimize 'gnus-xmas-tree-minimize) + (fset 'gnus-appt-select-lowest-window + 'gnus-xmas-appt-select-lowest-window) + (fset 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names) + (fset 'gnus-character-to-event 'character-to-event) + (fset 'gnus-mode-line-buffer-identification + 'gnus-xmas-mode-line-buffer-identification) + (fset 'gnus-key-press-event-p 'key-press-event-p) + (fset 'gnus-region-active-p 'region-active-p) + + (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add) + (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add) + (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add) + (add-hook 'gnus-score-mode-hook 'gnus-xmas-score-menu-add) + + (add-hook 'gnus-pick-mode-hook 'gnus-xmas-pick-menu-add) + (add-hook 'gnus-topic-mode-hook 'gnus-xmas-topic-menu-add) + (add-hook 'gnus-tree-mode-hook 'gnus-xmas-tree-menu-add) + (add-hook 'gnus-binary-mode-hook 'gnus-xmas-binary-menu-add) + (add-hook 'gnus-grouplens-mode-hook 'gnus-xmas-grouplens-menu-add) + (add-hook 'gnus-server-mode-hook 'gnus-xmas-server-menu-add) + (add-hook 'gnus-browse-mode-hook 'gnus-xmas-browse-menu-add) + + (add-hook 'gnus-group-mode-hook 'gnus-xmas-setup-group-toolbar) + (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar) + + (add-hook 'gnus-summary-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off) + + (when (and (<= emacs-major-version 19) + (<= emacs-minor-version 13)) + (setq gnus-article-x-face-too-ugly (when (eq (device-type) 'tty) + ".")) + (fset 'gnus-highlight-selected-summary + 'gnus-xmas-highlight-selected-summary) + (fset 'gnus-group-remove-excess-properties + 'gnus-xmas-group-remove-excess-properties) + (fset 'gnus-topic-remove-excess-properties + 'gnus-xmas-topic-remove-excess-properties) + (fset 'gnus-mode-line-buffer-identification 'identity) + (unless (boundp 'shell-command-switch) + (setq shell-command-switch "-c")))) + ;;; XEmacs logo and toolbar. ------------------ Environment follows ------------------ [SNIP] --Multipart_Sun_Apr_27_15:33:00_1997-1-- --Multipart_Mon_Apr_28_14:45:42_1997-1--