summaryrefslogtreecommitdiff
path: root/lisp/net/ldap.el
diff options
context:
space:
mode:
authorYuuki Harano <masm+github@masm11.me>2021-11-11 00:39:53 +0900
committerYuuki Harano <masm+github@masm11.me>2021-11-11 00:39:53 +0900
commit4dd1f56f29fc598a8339a345c2f8945250600602 (patch)
treeaf341efedffe027e533b1bcc0dbf270532e48285 /lisp/net/ldap.el
parent4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff)
parent810fa21d26453f898de9747ece7205dfe6de9d08 (diff)
downloademacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz
emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2
emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/net/ldap.el')
-rw-r--r--lisp/net/ldap.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 7997bf3c90b..8b35a2d8e16 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -51,7 +51,8 @@ a separator."
(defcustom ldap-default-port nil
"Default TCP port for LDAP connections.
-Initialized from the LDAP library at build time. Default value is 389."
+Initialized from the LDAP library at build time.
+Default value is 389."
:type '(choice (const :tag "Use library default" nil)
(integer :tag "Port number")))
@@ -153,8 +154,7 @@ Valid properties include:
(string :tag "Argument")))
(defcustom ldap-ldapsearch-password-prompt-regexp "Enter LDAP Password: "
- "A regular expression used to recognize the `ldapsearch'
-program's password prompt."
+ "Regexp used to recognize the `ldapsearch' program's password prompt."
:type 'regexp
:version "25.1")