[Emacs-diffs] master af991f1 3/4: EUDC: Remove XEmacs support

[Thomas Fitzsimmons]

branch: master
commit af991f15e6d6479e3b4c5a545df4fb09458d100a
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>

    EUDC: Remove XEmacs support
    
    * lisp/net/eudc.el (eudc-mode, eudc-install-menu): Remove
    XEmacs support.
    * lisp/net/eudc-hotlist.el (eudc-hotlist-mode)
    (eudc-hotlist-emacs-menu): Likewise.
    * lisp/net/eudc-bob.el (eudc-bob-toggle-inline-display)
    (eudc-bob-popup-menu, eudc-bob-generic-keymap)
    (eudc-bob-sound-keymap, eudc-bob-url-keymap)
    (eudc-bob-mail-keymap): Likewise.
    * etc/NEWS (EUDC): Mention removal of XEmacs support.
---
 etc/NEWS                 |   4 ++
 lisp/net/eudc-bob.el     | 108 +++++++++++++++++------------------------------
 lisp/net/eudc-hotlist.el |  10 +----
 lisp/net/eudc.el         |  38 +++--------------
 4 files changed, 51 insertions(+), 109 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 6f23f7e..d1a6868 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -394,6 +394,10 @@ buffer with the article(s) attached.
 *** 'erc-button-google-url' has been renamed 'erc-button-search-url'
 and its value has been changed to Duck Duck Go.
 
+** EUDC
+
+*** XEmacs support has been removed.
+
 ** eww/shr
 
 *** When opening external links in eww/shr (typically with the
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 425f99a..f63e807 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -155,40 +155,21 @@ display a button."
   "Toggle inline display of an image."
   (interactive)
   (when (eudc-bob-can-display-inline-images)
-    (cond ((featurep 'xemacs)
-          (let ((overlays (append (overlays-at (1- (point)))
-                                  (overlays-at (point))))
-                overlay glyph)
-            (setq overlay (car overlays))
-            (while (and overlay
-                        (not (setq glyph (overlay-get overlay 'glyph))))
-              (setq overlays (cdr overlays))
-              (setq overlay (car overlays)))
-            (if overlay
-                (if (overlay-get overlay 'end-glyph)
-                    (progn
-                      (overlay-put overlay 'end-glyph nil)
-                      (overlay-put overlay 'invisible nil))
-                  (overlay-put overlay 'end-glyph glyph)
-                  (overlay-put overlay 'invisible t)))))
-         (t
-          (let* ((overlays (append (overlays-at (1- (point)))
-                                   (overlays-at (point))))
-                 image)
-
-            ;; Search overlay with an image.
-            (while (and overlays (null image))
-              (let ((prop (overlay-get (car overlays) 'eudc-image)))
-                (if (eq 'image (car-safe prop))
-                    (setq image prop)
-                  (setq overlays (cdr overlays)))))
-
-            ;; Toggle that overlay's image display.
-            (when overlays
-              (let ((overlay (car overlays)))
-                (overlay-put overlay 'display
-                             (if (overlay-get overlay 'display)
-                                 nil image)))))))))
+    (let* ((overlays (append (overlays-at (1- (point)))
+                            (overlays-at (point))))
+          image)
+      ;; Search overlay with an image.
+      (while (and overlays (null image))
+       (let ((prop (overlay-get (car overlays) 'eudc-image)))
+         (if (eq 'image (car-safe prop))
+             (setq image prop)
+           (setq overlays (cdr overlays)))))
+      ;; Toggle that overlay's image display.
+      (when overlays
+       (let ((overlay (car overlays)))
+         (overlay-put overlay 'display
+                      (if (overlay-get overlay 'display)
+                          nil image)))))))
 
 (defun eudc-bob-display-audio (data)
   "Display a button for audio DATA."
@@ -272,25 +253,19 @@ display a button."
   (interactive "@e")
   (run-hooks 'activate-menubar-hook)
   (eudc-jump-to-event event)
-  (if (featurep 'xemacs)
-      (progn
-       (run-hooks 'activate-popup-menu-hook)
-       (popup-menu (eudc-bob-menu)))
-    (let ((result (x-popup-menu t (eudc-bob-menu)))
-         command)
-      (if result
-         (progn
-           (setq command (lookup-key (eudc-bob-menu)
-                                     (apply 'vector result)))
-           (command-execute command))))))
+  (let ((result (x-popup-menu t (eudc-bob-menu)))
+       command)
+    (if result
+       (progn
+         (setq command (lookup-key (eudc-bob-menu)
+                                   (apply 'vector result)))
+         (command-execute command)))))
 
 (setq eudc-bob-generic-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map "s" 'eudc-bob-save-object)
        (define-key map "!" 'eudc-bob-pipe-object-to-external-program)
-       (define-key map (if (featurep 'xemacs)
-                           [button3]
-                         [down-mouse-3]) 'eudc-bob-popup-menu)
+       (define-key map [down-mouse-3] 'eudc-bob-popup-menu)
        map))
 
 (setq eudc-bob-image-keymap
@@ -301,25 +276,19 @@ display a button."
 (setq eudc-bob-sound-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map [return] 'eudc-bob-play-sound-at-point)
-       (define-key map (if (featurep 'xemacs)
-                           [button2]
-                         [down-mouse-2]) 'eudc-bob-play-sound-at-mouse)
+       (define-key map [down-mouse-2] 'eudc-bob-play-sound-at-mouse)
        map))
 
 (setq eudc-bob-url-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map [return] 'browse-url-at-point)
-       (define-key map (if (featurep 'xemacs)
-                           [button2]
-                         [down-mouse-2]) 'browse-url-at-mouse)
+       (define-key map [down-mouse-2] 'browse-url-at-mouse)
        map))
 
 (setq eudc-bob-mail-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map [return] 'goto-address-at-point)
-       (define-key map (if (featurep 'xemacs)
-                           [button2]
-                         [down-mouse-2]) 'goto-address-at-point)
+       (define-key map [down-mouse-2] 'goto-address-at-point)
        map))
 
 (set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap)
@@ -327,19 +296,18 @@ display a button."
 
 ;; If the first arguments can be nil here, then these 3 can be
 ;; defconsts once more.
-(when (not (featurep 'xemacs))
-  (easy-menu-define eudc-bob-generic-menu
-    eudc-bob-generic-keymap
-    ""
-    eudc-bob-generic-menu)
-  (easy-menu-define eudc-bob-image-menu
-    eudc-bob-image-keymap
-    ""
-    eudc-bob-image-menu)
-  (easy-menu-define eudc-bob-sound-menu
-    eudc-bob-sound-keymap
-    ""
-    eudc-bob-sound-menu))
+(easy-menu-define eudc-bob-generic-menu
+  eudc-bob-generic-keymap
+  ""
+  eudc-bob-generic-menu)
+(easy-menu-define eudc-bob-image-menu
+  eudc-bob-image-keymap
+  ""
+  eudc-bob-image-menu)
+(easy-menu-define eudc-bob-sound-menu
+  eudc-bob-sound-keymap
+  ""
+  eudc-bob-sound-menu)
 
 ;;;###autoload
 (defun eudc-display-generic-binary (data)
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index a739561..0762445 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -55,11 +55,6 @@ These are the special commands of this mode:
     t -- Transpose the server at point and the previous one
     q -- Commit the changes and quit.
     x -- Quit without committing the changes."
-  (when (featurep 'xemacs)
-    (setq mode-popup-menu eudc-hotlist-menu)
-    (when (featurep 'menubar)
-      (set-buffer-menubar current-menubar)
-      (add-submenu nil (cons "EUDC-Hotlist" (cdr (cdr eudc-hotlist-menu))))))
   (setq buffer-read-only t))
 
 ;;;###autoload
@@ -179,10 +174,9 @@ These are the special commands of this mode:
     ["Save and Quit" eudc-hotlist-quit-edit t]
     ["Exit without Saving" kill-this-buffer t]))
 
-(when (not (featurep 'xemacs))
-  (easy-menu-define eudc-hotlist-emacs-menu
+(easy-menu-define eudc-hotlist-emacs-menu
     eudc-hotlist-mode-map
     ""
-    eudc-hotlist-menu))
+    eudc-hotlist-menu)
 
 ;;; eudc-hotlist.el ends here
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index ff8ed2c..a28fa6a 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -630,9 +630,7 @@ These are the special commands of EUDC mode:
     n -- Move to next record.
     p -- Move to previous record.
     b -- Insert record at point into the BBDB database."
-  (if (not (featurep 'xemacs))
-      (easy-menu-define eudc-emacs-menu eudc-mode-map "" (eudc-menu))
-    (setq mode-popup-menu (eudc-menu))))
+  (easy-menu-define eudc-emacs-menu eudc-mode-map "" (eudc-menu)))
 
 ;;}}}
 
@@ -1140,33 +1138,11 @@ queries the server for the existing fields and displays 
a corresponding form."
            eudc-tail-menu)))
 
 (defun eudc-install-menu ()
-  (cond
-   ((and (featurep 'xemacs) (featurep 'menubar))
-    (add-submenu '("Tools") (eudc-menu)))
-   ((not (featurep 'xemacs))
-    (cond
-     ((fboundp 'easy-menu-create-menu)
-      (define-key
-       global-map
-       [menu-bar tools directory-search]
-       (cons "Directory Servers"
-             (easy-menu-create-menu "Directory Servers" (cdr (eudc-menu))))))
-     ((fboundp 'easy-menu-add-item)
-      (let ((menu (eudc-menu)))
-       (easy-menu-add-item nil '("tools") (easy-menu-create-menu (car menu)
-                                                                 (cdr menu)))))
-     ((fboundp 'easy-menu-create-keymaps)
-      (easy-menu-define eudc-menu-map eudc-mode-map "Directory Client Menu" 
(eudc-menu))
-      (define-key
-       global-map
-       [menu-bar tools eudc]
-       (cons "Directory Servers"
-             (easy-menu-create-keymaps "Directory Servers"
-                                        (cdr (eudc-menu))))))
-     (t
-      (error "Unknown version of easymenu"))))
-   ))
-
+  (define-key
+    global-map
+    [menu-bar tools directory-search]
+    (cons "Directory Servers"
+         (easy-menu-create-menu "Directory Servers" (cdr (eudc-menu))))))
 
 ;;; Load time initializations :
 
@@ -1182,7 +1158,7 @@ queries the server for the existing fields and displays a 
corresponding form."
   (eudc-install-menu))
 
 
-;; The following installs a short menu for EUDC at XEmacs startup.
+;; The following installs a short menu for EUDC at Emacs startup.
 
 ;;;###autoload
 (defun eudc-load-eudc ()