diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-12-15 21:24:08 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-12-15 21:24:08 -0500 |
| commit | 2013a2f955e4dc6edf9869767e9f5d70fbf9d69c (patch) | |
| tree | d641c6fe8fc0b763645a5447f1fda75987cc4ac0 /lisp/net/gnutls.el | |
| parent | db50ad5f11cc5809c27091181a13ee7aa34ec5ed (diff) | |
| download | emacs-2013a2f955e4dc6edf9869767e9f5d70fbf9d69c.tar.gz | |
* lisp/emulation/cua-rect.el (cua-rectangle-mark-mode): New minor mode.
(cua--deactivate-rectangle): Don't deactivate the mark.
(cua-set-rectangle-mark): Don't set mark-active since
cua--activate-rectangle already does it for us.
(cua--rectangle-highlight-for-redisplay): Unhighlight a previous
non-rectangular region.
* lisp/emulation/cua-base.el (cua-repeat-replace-region):
Use with-current-buffer.
* lisp/net/gnutls.el: Use cl-lib.
(gnutls-negotiate): `mapcan' -> cl-mapcan.
Diffstat (limited to 'lisp/net/gnutls.el')
| -rw-r--r-- | lisp/net/gnutls.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 5bf9adc2b53..e9ba6288b6f 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -35,7 +35,7 @@ ;;; Code: -(eval-when-compile (require 'cl-lib)) +(require 'cl-lib) (defgroup gnutls nil "Emacs interface to the GnuTLS library." @@ -210,7 +210,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." t) ;; if a list, look for hostname matches ((listp gnutls-verify-error) - (mapcan + (cl-mapcan (lambda (check) (when (string-match (car check) hostname) (cdr check))) |