* gnus-art.el (gnus-mime-display-alternative)

(gnus-insert-mime-button, gnus-insert-mime-security-button)
(gnus-insert-prev-page-button, gnus-insert-next-page-button):
Don't use gnus-local-map-property.

* gnus-util.el (gnus-local-map-property): Remove.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c56540b..ce86cb5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2004-01-06  Jesper Harder  <harder@ifa.au.dk>
 
+       * gnus-art.el (gnus-mime-display-alternative)
+       (gnus-insert-mime-button, gnus-insert-mime-security-button)
+       (gnus-insert-prev-page-button, gnus-insert-next-page-button):
+       Don't use gnus-local-map-property.
+
+       * gnus-util.el (gnus-local-map-property): Remove.
+
        * mm-view.el (mm-view-pkcs7-decrypt): Replace
        gnus-completing-read-maybe-default with completing-read.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 14e3f1a..b6817ff 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4482,11 +4482,11 @@ N is the numerical prefix."
     (setq b (point))
     (gnus-eval-format
      gnus-mime-button-line-format gnus-mime-button-line-format-alist
-     `(,@(gnus-local-map-property gnus-mime-button-map)
-        gnus-callback gnus-mm-display-part
-        gnus-part ,gnus-tmp-id
-        article-type annotation
-        gnus-data ,handle))
+     `(keymap ,gnus-mime-button-map
+             gnus-callback gnus-mm-display-part
+             gnus-part ,gnus-tmp-id
+             article-type annotation
+             gnus-data ,handle))
     (setq e (if (bolp)
                ;; Exclude a newline.
                (1- (point))
@@ -4764,7 +4764,7 @@ If displaying \"text/html\" is discouraged \(see
                       ',gnus-article-mime-handle-alist))
               (gnus-mime-display-alternative
                ',ihandles ',not-pref ',begend ,id))
-            ,@(gnus-local-map-property gnus-mime-button-map)
+            keymap ,gnus-mime-button-map
             ,gnus-mouse-face-prop ,gnus-article-mouse-face
             face ,gnus-article-button-face
             gnus-part ,id
@@ -4788,7 +4788,7 @@ If displaying \"text/html\" is discouraged \(see
                         ',gnus-article-mime-handle-alist))
                 (gnus-mime-display-alternative
                  ',ihandles ',handle ',begend ,id))
-              ,@(gnus-local-map-property gnus-mime-button-map)
+              keymap ,gnus-mime-button-map
               ,gnus-mouse-face-prop ,gnus-article-mouse-face
               face ,gnus-article-button-face
               gnus-part ,id
@@ -6678,7 +6678,7 @@ specified by `gnus-button-alist'."
        (buffer-read-only nil))
     (gnus-eval-format
      gnus-prev-page-line-format nil
-     `(,@(gnus-local-map-property gnus-prev-page-map)
+     `(keymap ,gnus-prev-page-map
         gnus-prev t
         gnus-callback gnus-article-button-prev-page
         article-type annotation))
@@ -6728,7 +6728,7 @@ specified by `gnus-button-alist'."
   (let ((b (point))
        (buffer-read-only nil))
     (gnus-eval-format gnus-next-page-line-format nil
-                     `(,@(gnus-local-map-property gnus-next-page-map)
+                     `(keymap ,gnus-next-page-map
                          gnus-next t
                          gnus-callback gnus-article-button-next-page
                          article-type annotation))
@@ -7072,7 +7072,7 @@ For example:
     (gnus-eval-format
      gnus-mime-security-button-line-format
      gnus-mime-security-button-line-format-alist
-     `(,@(gnus-local-map-property gnus-mime-security-button-map)
+     `(keymap ,gnus-mime-security-button-map
         gnus-callback gnus-mime-security-press-button
         gnus-line-format ,gnus-mime-security-button-line-format
         gnus-mime-details ,gnus-mime-security-button-pressed

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 58c6633..e1f22b7 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1228,16 +1228,6 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
        `(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec)))
       (error "Invalid predicate specifier: %s" spec)))))
 
-(defun gnus-local-map-property (map)
-  "Return a list suitable for a text property list specifying keymap MAP."
-  (cond
-   ((featurep 'xemacs)
-    (list 'keymap map))
-   ((>= emacs-major-version 21)
-    (list 'keymap map))
-   (t
-    (list 'local-map map))))
-
 (defun gnus-completing-read (prompt table &optional predicate require-match
                                    history)
   (when (and history