(mime-view-mode): Optional argument `mother-keymap' was renamed to

`default-keymap-or-function'; optional argument `default-function' was
abolished.

diff --git a/mime-view.el b/mime-view.el
index 951ecc0..3b64b38 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -6,7 +6,7 @@
 ;; Created: 1994/7/13
 ;;     Renamed: 1994/8/31 from tm-body.el
 ;;     Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.1 $
+;; Version: $Revision: 0.2 $
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -44,7 +44,7 @@
 ;;;
 
 (defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.1 1997-02-20 09:02:36 tmorioka Exp $")
+  "$Id: mime-view.el,v 0.2 1997-02-21 04:19:40 tmorioka Exp $")
 
 (defconst mime-view-version (get-version-string mime-view-RCS-ID))
 
@@ -730,13 +730,14 @@ The compressed face will be piped to this command.")
        (popup-menu 'mime-view-xemacs-popup-menu))
       ))
 
-(defun mime-view-define-keymap (&optional mother default-function)
-  (let ((mime-view-mode-map (if mother
-                                 (copy-keymap mother)
-                               (make-sparse-keymap)
-                               )))
-    (or mother default-function
-       (suppress-keymap mime-view-mode-map))
+(defun mime-view-define-keymap (&optional default)
+  (let ((mime-view-mode-map (if (keymapp default)
+                               (copy-keymap default)
+                             (make-sparse-keymap)
+                             )))
+    (or (keymapp default)
+       (suppress-keymap mime-view-mode-map)
+       )
     (define-key mime-view-mode-map
       "u"        (function mime-view-up-content))
     (define-key mime-view-mode-map
@@ -779,11 +780,10 @@ The compressed face will be piped to this command.")
       ">"        (function end-of-buffer))
     (define-key mime-view-mode-map
       "?"        (function describe-mode))
-    (if default-function
+    (if (functionp default)
        (setq mime-view-mode-map
-             (append mime-view-mode-map
-                     (list (cons t default-function))
-                     )))
+             (append mime-view-mode-map (list (cons t default)))
+             ))
     (if mouse-button-2
        (define-key mime-view-mode-map
          mouse-button-2 (function tm:button-dispatcher))
@@ -811,7 +811,7 @@ The compressed face will be piped to this command.")
     ))
 
 (defun mime-view-mode (&optional mother ctl encoding ibuf obuf
-                                  mother-keymap default-function)
+                                default-keymap-or-function)
   "Major mode for viewing MIME message.
 
 Here is a list of the standard keys for mime-view-mode.
@@ -852,7 +852,7 @@ button-2    Move to point under the mouse cursor
          (progn
            (setq mime::preview/mother-buffer mother)
            ))
-      (mime-view-define-keymap mother-keymap default-function)
+      (mime-view-define-keymap default-keymap-or-function)
       (setq mime::preview/content-list (nth 1 ret))
       (goto-char
        (let ((ce (mime::preview-content-info/point-max