commit 19c14be04fec3ae958bd14623ca2f8f84a53915f (HEAD, refs/remotes/origin/master) Author: Glenn Morris Date: Sun May 23 16:03:03 2021 -0700 Tweak c-mode bug reporting address * lisp/progmodes/cc-mode.el (c-mode-help-address): Switch to bug-gnu-emacs. This is an alias for the previous submit@debbugs address, except that if no Package header can be found, as often seems to happen for cc-mode reports, debbugs will assign the report to the "emacs" package rather than to "debbugs.gnu.org". diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index a8f1662772..51085495bd 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -2979,7 +2979,7 @@ Key bindings: ;; bug reporting (defconst c-mode-help-address - "submit@debbugs.gnu.org" + "bug-gnu-emacs@gnu.org" "Address(es) for CC Mode bug reports.") (defun c-version () commit 2e55201b8085d64c76d9a35bffff90a02133647e Author: Philipp Stephani Date: Mon May 17 21:59:57 2021 +0200 Fix find invocation for macOS (Bug#48471). * lisp/progmodes/project.el (project--files-in-directory): Instead of appending a slash (which doesn't work well with macOS find), remove trailing slash and pass -H instead. diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 047f55ed1a..eab60756c8 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -297,11 +297,10 @@ to find the list of ignores for each directory." ;; expanded and not left for the shell command ;; to interpret. (localdir (file-name-unquote (file-local-name (expand-file-name dir)))) - (command (format "%s %s %s -type f %s -print0" + (command (format "%s -H %s %s -type f %s -print0" find-program (shell-quote-argument - ;; In case DIR is a symlink. - (file-name-as-directory localdir)) + (directory-file-name localdir)) ; Bug#48471 (xref--find-ignores-arguments ignores localdir) (if files (concat (shell-quote-argument "(") commit fc87cdf95986667bf083fdab01df20a6a07d5d0f Author: Michael Albinus Date: Sun May 23 12:34:36 2021 +0200 Adapt tramp-archive-autoload-file-name-handler * lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-handler): Bind `default-directory' to safe value. diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index a37009402c..d2ee7299be 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -347,10 +347,15 @@ arguments to pass to the OPERATION." ;;;###autoload (progn (defun tramp-archive-autoload-file-name-handler (operation &rest args) "Load Tramp archive file name handler, and perform OPERATION." - (if tramp-archive-enabled - (let ((tramp-archive-autoload t)) - tramp-archive-autoload ; Silence byte compiler. - (apply #'tramp-autoload-file-name-handler operation args))))) + (when tramp-archive-enabled + ;; We cannot use `tramp-compat-temporary-file-directory' here due + ;; to autoload. When installing Tramp's GNU ELPA package, there + ;; might be an older, incompatible version active. We try to + ;; overload this. + (let ((default-directory temporary-file-directory) + (tramp-archive-autoload t)) + tramp-archive-autoload ; Silence byte compiler. + (apply #'tramp-autoload-file-name-handler operation args))))) ;;;###autoload (progn (defun tramp-register-archive-file-name-handler ()