From eec20aecfb21c26e60d9a7f23267d15c1b40d7a1 Mon Sep 17 00:00:00 2001 From: Steve Youngs Date: Tue, 6 Jan 2004 04:09:16 +0000 Subject: [PATCH] 2004-01-06 Steve Youngs * messagexmas.el (message-xmas-redefine): Alias `message-make-caesar-translation-table' to ``message-xmas-make-caesar-translation-table' regardless of XEmacs version. * gnus-xmas.el (gnus-xmas-set-text-properties): Removed. (gnus-xmas-define): Don't alias `gnus-set-text-properties' to `gnus-xmas-set-text-properties'. (gnus-xmas-redefine): Don't alias `gnus-completing-read' to `gnus-xmas-completing-read'. (gnus-xmas-completing-read): Removed. (gnus-xmas-open-network-stream): Removed. * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on XEmacs version. * dns.el (dns-make-network-process): Use `open-network-stream' instead of `gnus-xmas-open-network-stream'. * dgnushack.el: Remove some XEmacs 21.1 specific stuff. * .cvsignore: Add auto-autoloads.el, custom-load.el. --- lisp/.cvsignore | 6 ++++-- lisp/ChangeLog | 25 +++++++++++++++++++++++ lisp/dgnushack.el | 5 ----- lisp/dns.el | 4 ++-- lisp/gnus-ems.el | 3 +-- lisp/gnus-xmas.el | 48 --------------------------------------------- lisp/messagexmas.el | 5 ++--- 7 files changed, 34 insertions(+), 62 deletions(-) diff --git a/lisp/.cvsignore b/lisp/.cvsignore index 2380bbeb2..861fbfa66 100644 --- a/lisp/.cvsignore +++ b/lisp/.cvsignore @@ -1,5 +1,7 @@ -Makefile -version *.elc +Makefile +auto-autoloads.el +custom-load.el gnus-load.el old +version diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce86cb5d7..53ad0683c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,28 @@ +2004-01-06 Steve Youngs + + * messagexmas.el (message-xmas-redefine): Alias + `message-make-caesar-translation-table' to + ``message-xmas-make-caesar-translation-table' regardless of XEmacs + version. + + * gnus-xmas.el (gnus-xmas-set-text-properties): Removed. + (gnus-xmas-define): Don't alias `gnus-set-text-properties' to + `gnus-xmas-set-text-properties'. + (gnus-xmas-redefine): Don't alias `gnus-completing-read' to + `gnus-xmas-completing-read'. + (gnus-xmas-completing-read): Removed. + (gnus-xmas-open-network-stream): Removed. + + * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on + XEmacs version. + + * dns.el (dns-make-network-process): Use `open-network-stream' + instead of `gnus-xmas-open-network-stream'. + + * dgnushack.el: Remove some XEmacs 21.1 specific stuff. + + * .cvsignore: Add auto-autoloads.el, custom-load.el. + 2004-01-06 Jesper Harder * gnus-art.el (gnus-mime-display-alternative) diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index c0ab694f5..b174522eb 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -132,11 +132,6 @@ than subr.el." (eval-and-compile (when (featurep 'xemacs) - ;; XEmacs 21.1 needs some extra hand holding - (when (eq emacs-minor-version 1) - (autoload 'custom-declare-face "cus-face" nil t) - (autoload 'cl-compile-time-init "cl-macs" nil t) - (autoload 'defadvice "advice" nil nil 'macro)) (unless (fboundp 'defadvice) (autoload 'defadvice "advice" nil nil 'macro)) (autoload 'Info-directory "info" nil t) diff --git a/lisp/dns.el b/lisp/dns.el index e24245aca..e5acf4e88 100644 --- a/lisp/dns.el +++ b/lisp/dns.el @@ -309,8 +309,8 @@ If TCP-P, the first two bytes of the package with be the length field." (if (featurep 'xemacs) `(let ((coding-system-for-read 'binary) (coding-system-for-write 'binary)) - (gnus-xmas-open-network-stream "dns" (current-buffer) - ,server "domain" 'udp)) + (open-network-stream "dns" (current-buffer) + ,server "domain" 'udp)) `(let ((server ,server) (coding-system-for-read 'binary) (coding-system-for-write 'binary)) diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index c172d2c2f..6fd34cfb5 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -37,8 +37,7 @@ (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)) + (if (featurep 'xemacs) '("--**-" . "-----") '("**" "--"))) diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index 2020672e4..baaa3e4e5 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -103,20 +103,6 @@ Possibly the `etc' directory has not been installed."))) (defvar standard-display-table) (defvar gnus-tree-minimize-window) -(defun gnus-xmas-set-text-properties (start end props &optional buffer) - "You should NEVER use this function. It is ideologically blasphemous. -It is provided only to ease porting of broken FSF Emacs programs." - (if (stringp buffer) - nil - (map-extents (lambda (extent ignored) - (remove-text-properties - start end - (list (extent-property extent 'text-prop) nil) - buffer) - nil) - buffer start end nil nil 'text-prop) - (gnus-add-text-properties start end props buffer))) - (defun gnus-xmas-highlight-selected-summary () ;; Highlight selected article in summary buffer (when gnus-summary-selected-face @@ -400,10 +386,6 @@ call it with the value of the `gnus-data' text property." (defalias 'gnus-window-edges 'window-pixel-edges) (defalias 'gnus-assq-delete-all 'gnus-xmas-assq-delete-all) - (if (and (<= emacs-major-version 19) - (< emacs-minor-version 14)) - (defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties)) - (unless (boundp 'standard-display-table) (setq standard-display-table nil)) @@ -456,11 +438,6 @@ call it with the value of the `gnus-data' text property." (defalias 'gnus-create-image 'gnus-xmas-create-image) (defalias 'gnus-remove-image 'gnus-xmas-remove-image) - (when (or (< emacs-major-version 21) - (and (= emacs-major-version 21) - (< emacs-minor-version 3))) - (defalias 'gnus-completing-read 'gnus-xmas-completing-read)) - ;; These ones are not defcutom'ed, sometimes not even defvar'ed. They ;; probably should. If that is done, the code below should then be moved ;; where each variable is defined, in order not to mess with user settings. @@ -872,31 +849,6 @@ Warning: Don't insert text immediately after the image." nil) nil nil nil nil nil 'gnus-image category)) -(defun gnus-xmas-completing-read (prompt table &optional - predicate require-match history) - (when (and history - (not (boundp history))) - (set history nil)) - (completing-read - (if (symbol-value history) - (concat prompt " (" (car (symbol-value history)) "): ") - (concat prompt ": ")) - table - predicate - require-match - nil - history)) - -;; This macro is because XEmacs versions prior to 21.2 do not have the -;; PROTOCOL argument to `open-network-stream'. -(defmacro gnus-xmas-open-network-stream (name buffer host service &optional protocol) - "Like `open-network-stream' but take into account older XEmacs versions." - (if (and (featurep 'xemacs) - (fboundp 'open-network-stream) - (emacs-version>= 21 2)) - `(open-network-stream ,name ,buffer ,host ,service ,protocol) - `(open-network-stream ,name ,buffer ,host ,service))) - (defun gnus-xmas-assq-delete-all (key alist) (let ((elem nil)) (while (setq elem (assq key alist)) diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el index 364e68594..b3e5028c7 100644 --- a/lisp/messagexmas.el +++ b/lisp/messagexmas.el @@ -122,9 +122,8 @@ If it is non-nil, it must be a toolbar. The five valid values are 'message-xmas-exchange-point-and-mark) (defalias 'message-mark-active-p 'region-exists-p) - (when (>= emacs-major-version 20) - (defalias 'message-make-caesar-translation-table - 'message-xmas-make-caesar-translation-table)) + (defalias 'message-make-caesar-translation-table + 'message-xmas-make-caesar-translation-table) (defalias 'message-make-overlay 'make-extent) (defalias 'message-delete-overlay 'delete-extent) (defalias 'message-overlay-put 'set-extent-property)) -- 2.25.1