Include versioned preloaded libraries in `package--builtin-versions'

[gnu-emacs] / lisp / mail / mailalias.el

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 577cec0fd86fd07ca899e9b3e7982974fd9badb4..59670a7dcbdffcbc27a747e1a0e773e8d93dd1e9 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,6 +1,6 @@
 ;;; mailalias.el --- expand and complete mailing address aliases -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985, 1987, 1995-1997, 2001-2015 Free Software
+;; Copyright (C) 1985, 1987, 1995-1997, 2001-2016 Free Software
 ;; Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
@@ -119,18 +119,23 @@ completed.  `pattern' is nil when `mail-directory-requery' is nil.
 
 The value might look like this:
 
-  '(remote-shell-program \"HOST\" \"-nl\" \"USER\" \"COMMAND\")
+  (remote-shell-program \"HOST\" \"-nl\" \"USER\" \"COMMAND\")
 
 or like this:
 
-  '(remote-shell-program \"HOST\" \"-n\" \"COMMAND '^\" pattern \"'\")"
+  (remote-shell-program \"HOST\" \"-n\" \"COMMAND \\='^\" pattern \"\\='\")"
   :type 'sexp
   :group 'mailalias)
 (put 'mail-directory-process 'risky-local-variable t)
 
 (defcustom mail-directory-stream nil
   "List of (HOST SERVICE) for stream connection to mail directory."
-  :type 'sexp
+  :type '(choice (const nil)
+                 (list (string :tag "Host name or ip address")
+                       (choice (integer :tag "Service port number")
+                               (string :tag "Service name"))
+                       (plist :inline t
+                              :tag "Additional open-network-stream parameters")))
   :group 'mailalias)
 (put 'mail-directory-stream 'risky-local-variable t)
 
@@ -512,7 +517,7 @@ PREFIX is the string we want to complete."
                                     mail-aliases))
                                (if (consp mail-local-names)
                                    mail-local-names)
-                               (or directory 
+                               (or directory
                                    (when (consp mail-directory-names)
                                      mail-directory-names)))
                        (lambda (a b)