[Emacs-diffs] scratch/backports-25.2 5afea13 33/46: Rename "Directory Search" menu to "Servers"

[Noam Postavsky]

branch: scratch/backports-25.2
commit 5afea1390da7e7b5e5f8228f30b7b049347c1c61
Author: Lars Ingebrigtsen <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Rename "Directory Search" menu to "Servers"
    
    * lisp/menu-bar.el (menu-bar-tools-menu): Rename "Directory
    Search" to "Directory Servers".  Suggested by Eli
    Zaretskii. (bug#14919).
    
    * lisp/net/eudc.el: Rename ditto throughout.
    
    (cherry picked from commit fafdfcb1fa629d659bb97986f8e748d75b97cad6)
---
 lisp/menu-bar.el |    2 +-
 lisp/net/eudc.el |   19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 640395e..b71314d 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1581,7 +1581,7 @@ mail status in mode line"))
     (bindings--define-key menu [browse-web]
       '(menu-item "Browse the Web..." browse-web))
     (bindings--define-key menu [directory-search]
-      '(menu-item "Directory Search" eudc-tools-menu))
+      '(menu-item "Directory Servers" eudc-tools-menu))
     (bindings--define-key menu [compose-mail]
       '(menu-item "Compose New Mail" compose-mail
                   :visible (and mail-user-agent (not (eq mail-user-agent 
'ignore)))
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 867bea9..22e48db 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -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)))))))))))
 
 ;;}}}