Merge remote-tracking branch 'origin/master' into feature/android

lisp/emacs-lisp/byte-opt.el

@@ -873,7 +873,13 @@ for speeding up processing.")
   (cons accum args))
 
 (defun byte-optimize-plus (form)
-  (let ((args (remq 0 (byte-opt--arith-reduce #'+ 0 (cdr form)))))
+  (let* ((not-0 (remq 0 (byte-opt--arith-reduce #'+ 0 (cdr form))))
+         (args (if (and (= (length not-0) 1)
+                        (> (length form) 2))
+                   ;; We removed numbers and only one arg remains: add a 0
+                   ;; so that it isn't turned into (* X 1) later on.
+                   (append not-0 '(0))
+                 not-0)))
     (cond
      ;; (+) -> 0
      ((null args) 0)

lisp/emacs-lisp/subr-x.el

@@ -504,11 +504,6 @@ Used by `emacs-authors-mode' and `emacs-news-mode'."
                           (progn (forward-line -1) (point))
                         (point-max)))))
 
-(defun eval-command-interactive-spec (command)
-  "Evaluate COMMAND's interactive form and return resultant list.
-If COMMAND has no interactive form, return nil."
-  (advice-eval-interactive-spec (cadr (interactive-form command))))
-
 (provide 'subr-x)
 
 ;;; subr-x.el ends here