diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-03-20 06:30:39 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-03-20 06:30:39 +0100 |
| commit | bcbfb88c2f458056283517f38ae5b50b1d87bfed (patch) | |
| tree | 060a878fa365516b300656507fd46159122a0b6c | |
| parent | f8873577563a937a47a475b58a1f868d4fa3ce18 (diff) | |
| parent | aedb9e3ec37512e4e2c1a6066613b2b5fcaf2aa6 (diff) | |
| download | emacs-bcbfb88c2f458056283517f38ae5b50b1d87bfed.tar.gz | |
Merge from origin/emacs-29
| -rw-r--r-- | lisp/url/url-gw.el | 2 | ||||
| -rw-r--r-- | lisp/url/url-misc.el | 2 | ||||
| -rw-r--r-- | test/src/keymap-tests.el | 18 |
3 files changed, 20 insertions, 2 deletions
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index f16be980945..4d7297f6f2e 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -208,7 +208,7 @@ linked Emacs under SunOS 4.x." proc))) (defvar url-gw-rlogin-obsolete-warned-once nil) -(make-obsolete-variable url-gw-rlogin-obsolete-warned-once nil "29.1") +(make-obsolete-variable 'url-gw-rlogin-obsolete-warned-once nil "29.1") ;;;###autoload (defun url-open-stream (name buffer host service &optional gateway-method) diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el index 3caaf49f58e..96f5c46ea00 100644 --- a/lisp/url/url-misc.el +++ b/lisp/url/url-misc.el @@ -48,7 +48,7 @@ nil)) (defvar url-misc-rlogin-obsolete-warned-once nil) -(make-obsolete-variable url-misc-rlogin-obsolete-warned-once nil "29.1") +(make-obsolete-variable 'url-misc-rlogin-obsolete-warned-once nil "29.1") (defun url-do-terminal-emulator (type server port user) (switch-to-buffer diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el index aa710519825..29220c95395 100644 --- a/test/src/keymap-tests.el +++ b/test/src/keymap-tests.el @@ -475,6 +475,24 @@ g .. h foo "a" #'next-line "a" #'previous-line))) +(ert-deftest keymap-unset-test-remove-and-inheritance () + "Check various behaviors of keymap-unset. (Bug#62207)" + (let ((map (make-sparse-keymap)) + (parent (make-sparse-keymap))) + (set-keymap-parent map parent) + ;; Removing an unset key should not add a key. + (keymap-set parent "u" #'undo) + (keymap-unset map "u" t) + (should (equal (keymap-lookup map "u") #'undo)) + ;; Non-removed child bindings should shadow parent + (keymap-set map "u" #'identity) + (keymap-unset map "u") + ;; From the child, but nil. + (should-not (keymap-lookup map "u")) + (keymap-unset map "u" t) + ;; From the parent this time/ + (should (equal (keymap-lookup map "u") #'undo)))) + (provide 'keymap-tests) ;;; keymap-tests.el ends here |