commit a84c3810b56f7bd56d455dfa8962f2e4653ce490 (HEAD, refs/remotes/origin/master) Author: Juri Linkov Date: Wed Jan 24 23:44:09 2018 +0200 * lisp/dired.el (dired-internal-do-deletions): Remove nreverse to compensate the changes that added nreverse to dired-do-delete and dired-do-flagged-delete in 9ecbdee (bug#30162) diff --git a/lisp/dired.el b/lisp/dired.el index eebf8362cf..eade11bc7f 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3094,7 +3094,7 @@ non-empty directories is allowed." (dired-recursive-deletes dired-recursive-deletes) (trashing (and trash delete-by-moving-to-trash))) ;; canonicalize file list for pop up - (setq files (nreverse (mapcar #'dired-make-relative files))) + (setq files (mapcar #'dired-make-relative files)) (if (dired-mark-pop-up " *Deletions*" 'delete files dired-deletion-confirmer (format "%s %s " commit bb2364205ea4297d5da72716d982cfe8fdf9a0dc Author: Stefan Monnier Date: Wed Jan 24 14:49:39 2018 -0500 * lisp/net/tramp.el: Require trampver here instead of... * lisp/net/tramp-compat.el: ... there. diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 16b56d74ce..4f564e6eb5 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -40,7 +40,6 @@ (require 'timer) (require 'ucs-normalize) -(require 'trampver) (require 'tramp-loaddefs) ;; For not existing functions, obsolete functions, or functions with a diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index d92d63c67b..5a2e358daa 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -56,6 +56,7 @@ ;;; Code: (require 'tramp-compat) +(require 'trampver) ;; Pacify byte-compiler. (require 'cl-lib) commit 686c83a473e4b235caac018aa0b61a5aad7c6a5b Author: Glenn Morris Date: Wed Jan 24 14:44:39 2018 -0500 * admin/automerge: Disable rebasing. diff --git a/admin/automerge b/admin/automerge index d96974ca56..54ac88db4f 100755 --- a/admin/automerge +++ b/admin/automerge @@ -181,10 +181,13 @@ echo "Tests finished ok" ## In case someone else pushed while we were working. -echo "Checking for remote changes..." -git fetch || die "fetch error" +#echo "Checking for remote changes..." +#git fetch || die "fetch error" +## NB If there were remote changes, this would rewrite the release +## branch commits, which is not what we want. +## Ref eg http://lists.gnu.org/r/emacs-devel/2014-12/msg01435.html ## git >= 1.8.5 has "pull --rebase=preserve" -git rebase --preserve-merges || die "rebase error" +#git rebase --preserve-merges || die "rebase error" echo "Pushing..."