Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from origin/emacs-29

Browse source 
aedb9e3ec3 Add tests for Bug#62207
faee8d5073 ; Fix 'make-obsolete-variable' forms
This commit is contained in:
Stefan Kangas 2023-03-20 06:30:39 +01:00
commit bcbfb88c2f
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/url/url-gw.el
View file

@ -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)

2
lisp/url/url-misc.el
View file

@ -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

18
test/src/keymap-tests.el
View file

@ -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