feature/native-comp f7e1029 1/3: Merge remote-tracking branch 'savannah/master' into HEAD

[Andrea Corallo]

branch: feature/native-comp
commit f7e10297d18b17f55b4a8442a3307db00605d46d
Merge: 73ced8c 82f8bee
Author: Andrea Corallo <address@hidden>
Commit: Andrea Corallo <address@hidden>

    Merge remote-tracking branch 'savannah/master' into HEAD
---
 lisp/emacs-lisp/cl-extra.el | 5 ++---
 lisp/svg.el                 | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index f8336d3..5bf7479 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -552,10 +552,9 @@ too large if positive or too small if negative)."
   (seq-subseq seq start end))
 
 ;;;###autoload
-(defun cl-concatenate (type &rest sequences)
+(defalias 'cl-concatenate #'seq-concatenate
   "Concatenate, into a sequence of type TYPE, the argument SEQUENCEs.
-\n(fn TYPE SEQUENCE...)"
-  (apply #'seq-concatenate type sequences))
+\n(fn TYPE SEQUENCE...)")
 
 ;;; List functions.
 
diff --git a/lisp/svg.el b/lisp/svg.el
index 370c9c0..7aadbc2 100644
--- a/lisp/svg.el
+++ b/lisp/svg.el
@@ -70,7 +70,8 @@ any further elements added."
              (height . ,height)
              (version . "1.1")
              (xmlns . "http://www.w3.org/2000/svg";)
-              (xmlns:xlink . "http://www.w3.org/1999/xlink";)
+              ,@(unless (plist-get args :xmlns:xlink)
+                  '((xmlns:xlink . "http://www.w3.org/1999/xlink";)))
               ,@(svg--arguments nil args))))
 
 (defun svg-gradient (svg id type stops)