[Emacs-diffs] Changes to emacs/lisp/net/eudc-bob.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/10/21 17:22:06

Index: net/eudc-bob.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/eudc-bob.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- net/eudc-bob.el     26 Jul 2007 05:27:18 -0000      1.17
+++ net/eudc-bob.el     21 Oct 2007 17:22:03 -0000      1.18
@@ -149,7 +149,7 @@
   "Toggle inline display of an image."
   (interactive)
   (when (eudc-bob-can-display-inline-images)
-    (cond (eudc-xemacs-p
+    (cond ((featurep 'xemacs)
           (let ((overlays (append (overlays-at (1- (point)))
                                   (overlays-at (point))))
                 overlay glyph)
@@ -266,7 +266,7 @@
   (interactive "@e")
   (run-hooks 'activate-menubar-hook)
   (eudc-jump-to-event event)
-  (if eudc-xemacs-p
+  (if (featurep 'xemacs)
       (progn
        (run-hooks 'activate-popup-menu-hook)
        (popup-menu (eudc-bob-menu)))
@@ -282,7 +282,7 @@
       (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 eudc-xemacs-p
+       (define-key map (if (featurep 'xemacs)
                            [button3]
                          [down-mouse-3]) 'eudc-bob-popup-menu)
        map))
@@ -295,7 +295,7 @@
 (setq eudc-bob-sound-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map [return] 'eudc-bob-play-sound-at-point)
-       (define-key map (if eudc-xemacs-p
+       (define-key map (if (featurep 'xemacs)
                            [button2]
                          [down-mouse-2]) 'eudc-bob-play-sound-at-mouse)
        map))
@@ -303,7 +303,7 @@
 (setq eudc-bob-url-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map [return] 'browse-url-at-point)
-       (define-key map (if eudc-xemacs-p
+       (define-key map (if (featurep 'xemacs)
                            [button2]
                          [down-mouse-2]) 'browse-url-at-mouse)
        map))
@@ -311,7 +311,7 @@
 (setq eudc-bob-mail-keymap
       (let ((map (make-sparse-keymap)))
        (define-key map [return] 'goto-address-at-point)
-       (define-key map (if eudc-xemacs-p
+       (define-key map (if (featurep 'xemacs)
                            [button2]
                          [down-mouse-2]) 'goto-address-at-mouse)
        map))
@@ -319,8 +319,7 @@
 (set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap)
 (set-keymap-parent eudc-bob-sound-keymap eudc-bob-generic-keymap)
 
-(if eudc-emacs-p
-    (progn
+(when (not (featurep 'xemacs))
       (easy-menu-define eudc-bob-generic-menu
                        eudc-bob-generic-keymap
                        ""
@@ -332,7 +331,7 @@
       (easy-menu-define eudc-bob-sound-menu
                        eudc-bob-sound-keymap
                        ""
-                       eudc-bob-sound-menu)))
+    eudc-bob-sound-menu))
 
 ;;;###autoload
 (defun eudc-display-generic-binary (data)