aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorStefan Monnier2013-12-15 21:24:08 -0500
committerStefan Monnier2013-12-15 21:24:08 -0500
commit2013a2f955e4dc6edf9869767e9f5d70fbf9d69c (patch)
treed641c6fe8fc0b763645a5447f1fda75987cc4ac0 /lisp/net
parentdb50ad5f11cc5809c27091181a13ee7aa34ec5ed (diff)
downloademacs-2013a2f955e4dc6edf9869767e9f5d70fbf9d69c.tar.gz
emacs-2013a2f955e4dc6edf9869767e9f5d70fbf9d69c.zip
* 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')
-rw-r--r--lisp/net/gnutls.el4
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 @@
35 35
36;;; Code: 36;;; Code:
37 37
38(eval-when-compile (require 'cl-lib)) 38(require 'cl-lib)
39 39
40(defgroup gnutls nil 40(defgroup gnutls nil
41 "Emacs interface to the GnuTLS library." 41 "Emacs interface to the GnuTLS library."
@@ -210,7 +210,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
210 t) 210 t)
211 ;; if a list, look for hostname matches 211 ;; if a list, look for hostname matches
212 ((listp gnutls-verify-error) 212 ((listp gnutls-verify-error)
213 (mapcan 213 (cl-mapcan
214 (lambda (check) 214 (lambda (check)
215 (when (string-match (car check) hostname) 215 (when (string-match (car check) hostname)
216 (cdr check))) 216 (cdr check)))