;;; mailalias.el --- expand and complete mailing address aliases -*- lexical-binding: t -*-
-;; Copyright (C) 1985, 1987, 1995-1997, 2001-2013 Free Software
+;; Copyright (C) 1985, 1987, 1995-1997, 2001-2016 Free Software
;; Foundation, Inc.
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
;; Keywords: mail
;; This file is part of GNU Emacs.
;;;###autoload
(defcustom mail-complete-style 'angles
"Specifies how \\[mail-complete] formats the full name when it completes.
-If `nil', they contain just the return address like:
+If nil, they contain just the return address like:
king@grassland.com
If `parens', they look like:
king@grassland.com (Elvis Parsley)
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)
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)