Merge from origin/emacs-25

[gnu-emacs] / lisp / net / eudc.el

diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 25a26bdf0298c4a5b40971cec48730eb23a5dc3d..22e48dbd3d3175ac6b32c8cf73fc978c2312e918 100644 (file)
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,6 +1,6 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2016 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;;         Pavel Janík <Pavel@Janik.cz>
@@ -1146,7 +1146,7 @@ queries the server for the existing fields and displays a corresponding form."
 
 (defun eudc-menu ()
   (let (command)
-    (append '("Directory Search")
+    (append '("Directory Servers")
            (list
             (append
              '("Server")
@@ -1186,8 +1186,8 @@ queries the server for the existing fields and displays a corresponding form."
       (define-key
        global-map
        [menu-bar tools directory-search]
-       (cons "Directory Search"
-             (easy-menu-create-menu "Directory Search" (cdr (eudc-menu))))))
+       (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)
@@ -1197,8 +1197,9 @@ queries the server for the existing fields and displays a corresponding form."
       (define-key
        global-map
        [menu-bar tools eudc]
-       (cons "Directory Search"
-             (easy-menu-create-keymaps "Directory Search" (cdr (eudc-menu))))))
+       (cons "Directory Servers"
+             (easy-menu-create-keymaps "Directory Servers"
+                                        (cdr (eudc-menu))))))
      (t
       (error "Unknown version of easymenu"))))
    ))
@@ -1231,7 +1232,7 @@ This does nothing except loading eudc by autoload side-effect."
 (cond
  ((not (featurep 'xemacs))
   (defvar eudc-tools-menu
-    (let ((map (make-sparse-keymap "Directory Search")))
+    (let ((map (make-sparse-keymap "Directory Servers")))
       (define-key map [phone]
        `(menu-item ,(purecopy "Get Phone") eudc-get-phone
                    :help ,(purecopy "Get the phone field of name from the directory server")))
@@ -1255,7 +1256,7 @@ This does nothing except loading eudc by autoload side-effect."
       map))
   (fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu)))
  (t
-  (let ((menu  '("Directory Search"
+  (let ((menu  '("Directory Servers"
                 ["Load Hotlist of Servers" eudc-load-eudc t]
                 ["New Server" eudc-set-server t]
                 ["---" nil nil]
@@ -1279,8 +1280,8 @@ This does nothing except loading eudc by autoload side-effect."
            (define-key
              global-map
              [menu-bar tools eudc]
-             (cons "Directory Search"
-                   (easy-menu-create-keymaps "Directory Search"
+             (cons "Directory Servers"
+                   (easy-menu-create-keymaps "Directory Servers"
                                              (cdr menu)))))))))))
 
 ;;}}}