From eedd9db6190a7f69403aefe8098a554ef2b51371 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 9 Oct 2023 23:47:52 -0400 Subject: [PATCH 1/3] Update to Org 9.6.10 --- etc/refcards/orgcard.tex | 2 +- lisp/org/org-agenda.el | 3 ++- lisp/org/org-colview.el | 3 ++- lisp/org/org-version.el | 4 ++-- lisp/org/org.el | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 62ba687c19f..240e3366b0b 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{9.6.9} +\def\orgversionnumber{9.6.10} \def\versionyear{2023} % latest update \input emacsver.tex diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index d3e61643190..38e81d9d713 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -6784,7 +6784,8 @@ scheduled items with an hour specification like [h]h:mm." (let ((deadline (time-to-days (when (org-element-property :deadline el) (org-time-string-to-time - (org-element-property :deadline el)))))) + (org-element-interpret-data + (org-element-property :deadline el))))))) (and (<= schedule deadline) (> current deadline)))) (`not-today pastschedp) (`t t) diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el index 28cfd0d910c..475416ecf74 100644 --- a/lisp/org/org-colview.el +++ b/lisp/org/org-colview.el @@ -525,7 +525,8 @@ for the duration of the command.") (setq header-line-format org-previous-header-line-format) (kill-local-variable 'org-previous-header-line-format) (remove-hook 'post-command-hook #'org-columns-hscroll-title 'local)) - (set-marker org-columns-begin-marker nil) + (when (markerp org-columns-begin-marker) + (set-marker org-columns-begin-marker nil)) (when (markerp org-columns-top-level-marker) (set-marker org-columns-top-level-marker nil)) (with-silent-modifications diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index a859fe6d412..cfef38581c6 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.6.9")) + (let ((org-release "9.6.10")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.6.9")) + (let ((org-git-version "release_9.6.10")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index f97b9b6c753..0ba0cef4490 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; URL: https://orgmode.org ;; Package-Requires: ((emacs "26.1")) -;; Version: 9.6.9 +;; Version: 9.6.10 ;; This file is part of GNU Emacs. ;; From 30239759ee45b5077caf95ce5aa47b3af885afbe Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 12 Oct 2023 13:23:38 +0200 Subject: [PATCH 2/3] ; Set maintainer for elint.el to emacs-devel * lisp/emacs-lisp/elint.el: Set maintainer to emacs-devel. --- lisp/emacs-lisp/elint.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 9812c663ea8..c04b15dd237 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -1,8 +1,9 @@ ;;; elint.el --- Lint Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 1997, 2001-2023 Free Software Foundation, Inc. +;; Copyright (C) 1997-2023 Free Software Foundation, Inc. ;; Author: Peter Liljenberg +;; Maintainer: emacs-devel@gnu.org ;; Created: May 1997 ;; Keywords: lisp @@ -27,7 +28,7 @@ ;; misspellings and undefined variables, although it can also catch ;; function calls with the wrong number of arguments. -;; To use, call `elint-current-buffer' or `elint-defun' to lint a buffer +;; To use it, call `elint-current-buffer' or `elint-defun' to lint a buffer ;; or defun. The first call runs `elint-initialize' to set up some ;; argument data, which may take a while. @@ -37,9 +38,9 @@ ;;; To do: -;; * Adding type checking. (Stop that sniggering!) +;; * Adding type checking. (Stop that sniggering!) ;; * Make eval-when-compile be sensitive to the difference between -;; funcs and macros. +;; functions and macros. ;; * Requires within function bodies. ;; * Handle defstruct. ;; * Prevent recursive requires. From c8ea14e7825d536f41a230fc1298341a2462635e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 13 Oct 2023 16:09:51 +0200 Subject: [PATCH 3/3] Handle quoted tilde in Tramp * lisp/net/tramp.el (tramp-handle-expand-file-name): * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): * lisp/net/tramp-sh.el (tramp-sh-handle-expand-file-name): * lisp/net/tramp-smb.el (tramp-smb-handle-expand-file-name): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-expand-file-name): Handle quoted tilde. (Bug#65685) * test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name-tilde): New test. --- lisp/net/tramp-gvfs.el | 5 ++++- lisp/net/tramp-sh.el | 3 +++ lisp/net/tramp-smb.el | 3 +++ lisp/net/tramp-sudoedit.el | 3 +++ lisp/net/tramp.el | 3 +++ test/lisp/net/tramp-tests.el | 11 +++++++++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 46342042880..07390b50df2 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1176,10 +1176,13 @@ file names." (tramp-run-real-handler #'expand-file-name (list name)) ;; Dissect NAME. (with-parsed-tramp-file-name name nil + ;; Tilde expansion shall be possible also for quoted localname. + (when (string-prefix-p "~" (file-name-unquote localname)) + (setq localname (file-name-unquote localname))) ;; If there is a default location, expand tilde. (when (string-match (tramp-compat-rx bos "~" (group (* (not "/"))) (group (* nonl)) eos) - localname) + localname) (let ((uname (match-string 1 localname)) (fname (match-string 2 localname)) hname) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 59d5c00515f..74b1638f120 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2831,6 +2831,9 @@ the result will be a local, non-Tramp, file name." (tramp-run-real-handler #'expand-file-name (list name))) (unless (tramp-run-real-handler #'file-name-absolute-p (list localname)) (setq localname (concat "~/" localname))) + ;; Tilde expansion shall be possible also for quoted localname. + (when (string-prefix-p "~" (file-name-unquote localname)) + (setq localname (file-name-unquote localname))) ;; Tilde expansion if necessary. This needs a shell which ;; groks tilde expansion! The function `tramp-find-shell' is ;; supposed to find such a shell on the remote host. Please diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 7249fa266ac..0ba24352a3d 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -731,6 +731,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-run-real-handler #'expand-file-name (list name)) ;; Dissect NAME. (with-parsed-tramp-file-name name nil + ;; Tilde expansion shall be possible also for quoted localname. + (when (string-prefix-p "~" (file-name-unquote localname)) + (setq localname (file-name-unquote localname))) ;; Tilde expansion if necessary. (when (string-match (tramp-compat-rx bos "~" (group (* (not "/"))) (group (* nonl)) eos) diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index d167bf13b14..9939d93ba35 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -380,6 +380,9 @@ the result will be a local, non-Tramp, file name." ;; but to the root home directory. (when (tramp-string-empty-or-nil-p localname) (setq localname "~")) + ;; Tilde expansion shall be possible also for quoted localname. + (when (string-prefix-p "~" (file-name-unquote localname)) + (setq localname (file-name-unquote localname))) (unless (file-name-absolute-p localname) (setq localname (format "~%s/%s" user localname))) (when (string-match diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 02051736cc5..d1b38cfeb93 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3982,6 +3982,9 @@ Let-bind it when necessary.") (with-parsed-tramp-file-name name nil (unless (tramp-run-real-handler #'file-name-absolute-p (list localname)) (setq localname (concat "/" localname))) + ;; Tilde expansion shall be possible also for quoted localname. + (when (string-prefix-p "~" (file-name-unquote localname)) + (setq localname (file-name-unquote localname))) ;; Expand tilde. Usually, the methods applying this handler do ;; not support tilde expansion. But users could declare a ;; respective connection property. (Bug#53847) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 0648fe9e80f..e74837b926a 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -2335,6 +2335,17 @@ Also see `ignore'." (should (string-equal (expand-file-name local dir) dir)) (should (string-equal (expand-file-name (concat dir local)) dir))))) +;; The following test is inspired by Bug#65685. +(ert-deftest tramp-test05-expand-file-name-tilde () + "Check `expand-file-name'." + (skip-unless (tramp--test-enabled)) + (skip-unless (not (tramp--test-ange-ftp-p))) + + (let ((dir (file-remote-p ert-remote-temporary-file-directory)) + (tramp-tolerate-tilde t)) + (should (string-equal (expand-file-name (concat dir "~")) + (expand-file-name (concat dir "/:~")))))) + (ert-deftest tramp-test06-directory-file-name () "Check `directory-file-name'. This checks also `file-name-as-directory', `file-name-directory',