2000-10-06 13:46:47 ShengHuo ZHU <zsh@cs.rochester.edu>

	* base64.el, dgnushack.el, gnus-spec.el, messagexmas.el
	* gnus-xmas.el, nnheaderxm.el, nndraft.el: Use defalias.

	* gnus-xmas.el (gnus-xmas-define): Defalias gnus-overlay-buffer,
	gnus-overlay-start.
	* gnus.el: Ditto.
	* gnus-art.el (gnus-insert-mime-button): Use them.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e26b48a..b8f556a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-06 13:46:47  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * base64.el, dgnushack.el, gnus-spec.el, messagexmas.el
+       * gnus-xmas.el, nnheaderxm.el, nndraft.el: Use defalias.
+
+       * gnus-xmas.el (gnus-xmas-define): Defalias gnus-overlay-buffer,
+       gnus-overlay-start.
+       * gnus.el: Ditto.
+       * gnus-art.el (gnus-insert-mime-button): Use them.
+
 2000-10-06 10:01:08  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-with-unibyte-current-buffer): Don't set unibyte

diff --git a/lisp/base64.el b/lisp/base64.el
index 954ed18..73c2d64 100644 (file)
--- a/lisp/base64.el
+++ b/lisp/base64.el
@@ -29,7 +29,7 @@
 
 ;; For non-MULE
 (if (not (fboundp 'char-int))
-    (fset 'char-int 'identity))
+    (defalias 'char-int 'identity))
 
 (defvar base64-alphabet
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/")
@@ -272,7 +272,7 @@ base64-encoder-program.")
        (buffer-string)
       (kill-buffer (current-buffer)))))
 
-(fset 'base64-decode-string 'base64-decode)
-(fset 'base64-encode-string 'base64-encode)
+(defalias 'base64-decode-string 'base64-decode)
+(defalias 'base64-encode-string 'base64-encode)
 
 (provide 'base64)

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index cf1f003..a425049 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(fset 'facep 'ignore)
+(defalias 'facep 'ignore)
 
 (require 'cl)
 
@@ -96,10 +96,10 @@
 
 (eval-and-compile
   (unless (featurep 'xemacs)
-    (fset 'get-popup-menu-response 'ignore)
-    (fset 'event-object 'ignore)
-    (fset 'x-defined-colors 'ignore)
-    (fset 'read-color 'ignore)))
+    (defalias 'get-popup-menu-response 'ignore)
+    (defalias 'event-object 'ignore)
+    (defalias 'x-defined-colors 'ignore)
+    (defalias 'read-color 'ignore)))
 
 (defun dgnushack-compile (&optional warn)
   ;;(setq byte-compile-dynamic t)

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 992c87a..d492f77 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3269,8 +3269,8 @@ In no internal viewer is available, use an external viewer."
        ;; window, overlay, position.
        (if (mm-handle-displayed-p
             (if overlay
-                (with-current-buffer (overlay-buffer overlay)
-                  (widget-get (widget-at (overlay-start overlay))
+                (with-current-buffer (gnus-overlay-buffer overlay)
+                  (widget-get (widget-at (gnus-overlay-start overlay))
                               :mime-handle))
               (widget-get widget/window :mime-handle)))
            "hide" "show")

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 07d1a87..3878b8a 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -531,7 +531,7 @@ If PROPS, insert the result."
                       ;; Under XEmacs, it's (funcall #<compiled-function ...>)
                       (not (and (eq 'funcall (car form))
                                 (byte-code-function-p (cadr form)))))
-             (fset 'gnus-tmp-func `(lambda () ,form))
+             (defalias 'gnus-tmp-func `(lambda () ,form))
              (byte-compile 'gnus-tmp-func)
              (setcar (cddr entry) (gnus-byte-code 'gnus-tmp-func))))))
 

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index ada81cc..6bea994 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -406,26 +406,28 @@ call it with the value of the `gnus-data' text property."
   (cond
    ((fboundp 'char-or-char-int-p)
     ;; Handle both types of marks for XEmacs-20.x.
-    (fset 'gnus-characterp 'char-or-char-int-p))
+    (defalias 'gnus-characterp 'char-or-char-int-p))
    ;; V19 of XEmacs, probably.
    (t
-    (fset 'gnus-characterp 'characterp)))
-
-  (fset 'gnus-make-overlay 'make-extent)
-  (fset 'gnus-delete-overlay 'delete-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-kill-all-overlays 'gnus-xmas-kill-all-overlays)
-  (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)
-  (fset 'gnus-deactivate-mark 'ignore)
-  (fset 'gnus-window-edges 'window-pixel-edges)
+    (defalias 'gnus-characterp 'characterp)))
+
+  (defalias 'gnus-make-overlay 'make-extent)
+  (defalias 'gnus-delete-overlay 'delete-extent)
+  (defalias 'gnus-overlay-put 'set-extent-property)
+  (defalias 'gnus-move-overlay 'gnus-xmas-move-overlay)
+  (defalias 'gnus-overlay-buffer 'extent-object)
+  (defalias 'gnus-overlay-start 'extent-start-position)
+  (defalias 'gnus-overlay-end 'extent-end-position)
+  (defalias 'gnus-kill-all-overlays 'gnus-xmas-kill-all-overlays)
+  (defalias 'gnus-extent-detached-p 'extent-detached-p)
+  (defalias 'gnus-add-text-properties 'gnus-xmas-add-text-properties)
+  (defalias 'gnus-put-text-property 'gnus-xmas-put-text-property)
+  (defalias 'gnus-deactivate-mark 'ignore)
+  (defalias 'gnus-window-edges 'window-pixel-edges)
 
   (if (and (<= emacs-major-version 19)
           (< emacs-minor-version 14))
-      (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
+      (defalias '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))
@@ -443,9 +445,9 @@ call it with the value of the `gnus-data' text property."
        (cons 'progn (cdr (cdr fval))))))
 
   (unless (fboundp 'match-string-no-properties)
-    (fset 'match-string-no-properties 'match-string))
+    (defalias 'match-string-no-properties 'match-string))
 
-  (fset 'gnus-x-color-values
+  (defalias 'gnus-x-color-values
        (if (fboundp 'x-color-values)
            'x-color-values
          (lambda (color)
@@ -454,25 +456,25 @@ call it with the value of the `gnus-data' text property."
 
 (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-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
+  (defalias 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table)
+  (defalias 'gnus-visual-turn-off-edit-menu 'identity)
+  (defalias 'gnus-summary-recenter 'gnus-xmas-summary-recenter)
+  (defalias 'gnus-extent-start-open 'gnus-xmas-extent-start-open)
+  (defalias 'gnus-article-push-button 'gnus-xmas-article-push-button)
+  (defalias 'gnus-window-top-edge 'gnus-xmas-window-top-edge)
+  (defalias 'gnus-read-event-char 'gnus-xmas-read-event-char)
+  (defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
+  (defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
+  (defalias '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
+  (defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
+  (defalias 'gnus-character-to-event 'character-to-event)
+  (defalias '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)
-  (fset 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
-  (fset 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu)
+  (defalias 'gnus-key-press-event-p 'key-press-event-p)
+  (defalias 'gnus-region-active-p 'region-active-p)
+  (defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
+  (defalias 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu)
 
   (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add)
   (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 251f5f7..1b8cd5e 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -278,6 +278,8 @@ be set in `.emacs' instead."
   (defalias 'gnus-delete-overlay 'delete-overlay)
   (defalias 'gnus-overlay-put 'overlay-put)
   (defalias 'gnus-move-overlay 'move-overlay)
+  (defalias 'gnus-overlay-buffer 'overlay-buffer)
+  (defalias 'gnus-overlay-start 'overlay-start)
   (defalias 'gnus-overlay-end 'overlay-end)
   (defalias 'gnus-extent-detached-p 'ignore)
   (defalias 'gnus-extent-start-open 'ignore)

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 19939f7..175586f 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -5,7 +5,7 @@
 (defun maybe-fbind (args)
   (while args
     (or (fboundp (car args))
-       (fset (car args) 'ignore))
+       (defalias (car args) 'ignore))
     (setq args (cdr args))))
 
 (defun maybe-bind (args)

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index a375cd1..6ee575c 100644 (file)
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -90,7 +90,8 @@ If it is non-nil, it must be a toolbar.  The five valid values are
   "Exchange point and mark, but allow for XEmacs' optional argument."
   (exchange-point-and-mark message-xmas-dont-activate-region))
 
-(fset 'message-exchange-point-and-mark 'message-xmas-exchange-point-and-mark)
+(defalias 'message-exchange-point-and-mark 
+  'message-xmas-exchange-point-and-mark)
 
 (defun message-xmas-maybe-fontify ()
   (when (featurep 'font-lock)
@@ -114,8 +115,8 @@ If it is non-nil, it must be a toolbar.  The five valid values are
      (substring table (+ a 26) 255))))
 
 (when (>= emacs-major-version 20)
-  (fset 'message-make-caesar-translation-table
-       'message-xmas-make-caesar-translation-table))
+  (defalias 'message-make-caesar-translation-table
+    'message-xmas-make-caesar-translation-table))
 
 (add-hook 'message-mode-hook 'message-xmas-maybe-fontify)
 

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 1d320a5..52b4059 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -35,7 +35,7 @@
 (eval-when-compile
   (require 'cl)
   ;; This is just to shut up the byte-compiler.
-  (fset 'nndraft-request-group 'ignore))
+  (defalias 'nndraft-request-group 'ignore))
 
 (nnoo-declare nndraft
   nnmh)

diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el
index ecd256b..8c1522f 100644 (file)
--- a/lisp/nnheaderxm.el
+++ b/lisp/nnheaderxm.el
@@ -32,9 +32,9 @@
       (,function ,@args))
    time repeat))
 
-(fset 'nnheader-run-at-time 'nnheader-xmas-run-at-time)
-(fset 'nnheader-cancel-timer 'delete-itimer)
-(fset 'nnheader-cancel-function-timers 'ignore)
+(defalias 'nnheader-run-at-time 'nnheader-xmas-run-at-time)
+(defalias 'nnheader-cancel-timer 'delete-itimer)
+(defalias 'nnheader-cancel-function-timers 'ignore)
 
 (provide 'nnheaderxm)