* gnus-art.el, gnus-ems.el, gnus-start.el: Remove gnus-xemacs.
* gnus-ems.el: Autoload smiley.
* gnus-art.el (gnus-treat-display-smileys): Default value in Emacs 21.
2000-10-08 08:45:48 ShengHuo ZHU <zsh@cs.rochester.edu>
* gnus-sum.el (gnus-summary-display-article): Enable multibyte.
(gnus-summary-select-article): Don't enable multibyte here.
(gnus-summary-goto-article): Ditto.
+2000-10-08 08:57:13 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * gnus-art.el, gnus-ems.el, gnus-start.el: Remove gnus-xemacs.
+ * gnus-ems.el: Autoload smiley.
+ * gnus-art.el (gnus-treat-display-smileys): Default value in Emacs 21.
+
+2000-10-08 08:45:48 ShengHuo ZHU <zsh@cs.rochester.edu>
+
+ * gnus-sum.el (gnus-summary-display-article): Enable multibyte.
+ (gnus-summary-select-article): Don't enable multibyte here.
+ (gnus-summary-goto-article): Ditto.
+
2000-10-08 Christoph Conrad <christoph.conrad@gmx.de>
* gnus-draft.el (gnus-draft-send-message): Typo.
2000-10-08 Christoph Conrad <christoph.conrad@gmx.de>
* gnus-draft.el (gnus-draft-send-message): Typo.
(defcustom gnus-treat-display-xface
(and (or (and (fboundp 'image-type-available-p)
(image-type-available-p 'xbm))
(defcustom gnus-treat-display-xface
(and (or (and (fboundp 'image-type-available-p)
(image-type-available-p 'xbm))
- (and gnus-xemacs (featurep 'xface)))
+ (and (featurep 'xemacs) (featurep 'xface)))
'head)
"Display X-Face headers.
Valid values are nil, t, `head', `last', an integer or a predicate.
'head)
"Display X-Face headers.
Valid values are nil, t, `head', `last', an integer or a predicate.
:type gnus-article-treat-head-custom)
(put 'gnus-treat-display-xface 'highlight t)
:type gnus-article-treat-head-custom)
(put 'gnus-treat-display-xface 'highlight t)
-(defcustom gnus-treat-display-smileys (if (and gnus-xemacs
- (featurep 'xpm))
- t nil)
+(defcustom gnus-treat-display-smileys
+ (if (or (and (featurep 'xemacs)
+ (featurep 'xpm))
+ (and (fboundp 'image-type-available-p)
+ (image-type-available-p 'pbm)))
+ t nil)
"Display smileys.
Valid values are nil, t, `head', `last', an integer or a predicate.
See the manual for details."
"Display smileys.
Valid values are nil, t, `head', `last', an integer or a predicate.
See the manual for details."
:type gnus-article-treat-custom)
(put 'gnus-treat-display-smileys 'highlight t)
:type gnus-article-treat-custom)
(put 'gnus-treat-display-smileys 'highlight t)
-(defcustom gnus-treat-display-picons (if gnus-xemacs 'head nil)
+(defcustom gnus-treat-display-picons (if (featurep 'xemacs) 'head nil)
"Display picons.
Valid values are nil, t, `head', `last', an integer or a predicate.
See the manual for details."
"Display picons.
Valid values are nil, t, `head', `last', an integer or a predicate.
See the manual for details."
(set-buffer gnus-article-current-summary)
(let (gnus-pick-mode)
(push (or key last-command-event) unread-command-events)
(set-buffer gnus-article-current-summary)
(let (gnus-pick-mode)
(push (or key last-command-event) unread-command-events)
- (setq keys (if gnus-xemacs
+ (setq keys (if (featurep 'xemacs)
(events-to-keys (read-key-sequence nil))
(read-key-sequence nil)))))
(events-to-keys (read-key-sequence nil))
(read-key-sequence nil)))))
;;; Function aliases later to be redefined for XEmacs usage.
;;; Function aliases later to be redefined for XEmacs usage.
-(eval-and-compile
- (defvar gnus-xemacs (featurep 'xemacs)
- "Non-nil if running under XEmacs."))
-
(defvar gnus-mouse-2 [mouse-2])
(defvar gnus-down-mouse-3 [down-mouse-3])
(defvar gnus-down-mouse-2 [down-mouse-2])
(defvar gnus-widget-button-keymap nil)
(defvar gnus-mode-line-modified
(defvar gnus-mouse-2 [mouse-2])
(defvar gnus-down-mouse-3 [down-mouse-3])
(defvar gnus-down-mouse-2 [down-mouse-2])
(defvar gnus-widget-button-keymap nil)
(defvar gnus-mode-line-modified
+ (if (or (featurep 'xemacs)
(< emacs-major-version 20))
'("--**-" . "-----")
'("**" "--")))
(< emacs-major-version 20))
'("--**-" . "-----")
'("**" "--")))
(autoload 'gnus-xmas-redefine "gnus-xmas")
(autoload 'appt-select-lowest-window "appt"))
(autoload 'gnus-xmas-redefine "gnus-xmas")
(autoload 'appt-select-lowest-window "appt"))
-(autoload 'gnus-smiley-display "smiley-ems") ; override XEmacs version
+(if (featurep 'xemacs)
+ (autoload 'gnus-smiley-display "smiley")
+ (autoload 'gnus-smiley-display "smiley-ems") ; override XEmacs version
+)
valstr)))
(eval-and-compile
valstr)))
(eval-and-compile
(gnus-xmas-define)
(defvar gnus-mouse-face-prop 'mouse-face
"Property used for highlighting mouse regions.")))
(gnus-xmas-define)
(defvar gnus-mouse-face-prop 'mouse-face
"Property used for highlighting mouse regions.")))
(defun gnus-ems-redefine ()
(cond
(defun gnus-ems-redefine ()
(cond
(gnus-xmas-redefine))
((featurep 'mule)
(gnus-xmas-redefine))
((featurep 'mule)
(when gnus-simple-splash
(setq gnus-simple-splash nil)
(cond
(when gnus-simple-splash
(setq gnus-simple-splash nil)
(cond
(gnus-xmas-splash))
((and (eq window-system 'x)
(= (frame-height) (1+ (window-height))))
(gnus-xmas-splash))
((and (eq window-system 'x)
(= (frame-height) (1+ (window-height))))
(let ((str (buffer-substring
(point) (progn (end-of-line) (point))))
(coding
(let ((str (buffer-substring
(point) (progn (end-of-line) (point))))
(coding
+ (and (or (featurep 'xemacs)
(and (boundp 'enable-multibyte-characters)
enable-multibyte-characters))
(fboundp 'gnus-mule-get-coding-system)
(and (boundp 'enable-multibyte-characters)
enable-multibyte-characters))
(fboundp 'gnus-mule-get-coding-system)
(defun gnus-summary-display-article (article &optional all-header)
"Display ARTICLE in article buffer."
(defun gnus-summary-display-article (article &optional all-header)
"Display ARTICLE in article buffer."
+ (when (gnus-buffer-live-p gnus-article-buffer)
+ (with-current-buffer gnus-article-buffer
+ (mm-enable-multibyte-mule4)))
(gnus-set-global-variables)
(if (null article)
nil
(gnus-set-global-variables)
(if (null article)
nil
force)
;; The requested article is different from the current article.
(progn
force)
;; The requested article is different from the current article.
(progn
- (when (gnus-buffer-live-p gnus-article-buffer)
- (with-current-buffer gnus-article-buffer
- (mm-enable-multibyte-mule4)))
(gnus-summary-display-article article all-headers)
(when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer
(gnus-summary-display-article article all-headers)
(when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer
gnus-newsgroup-limit))
current-prefix-arg
t))
gnus-newsgroup-limit))
current-prefix-arg
t))
- (when (gnus-buffer-live-p gnus-article-buffer)
- (with-current-buffer gnus-article-buffer
- (mm-enable-multibyte-mule4)))
(prog1
(if (and (stringp article)
(string-match "@" article))
(prog1
(if (and (stringp article)
(string-match "@" article))