]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2bf7bc4) | patch
Revert "alas, a map can have only one parent"
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 2 May 2016 18:08:48 +0000 (20:08 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 2 May 2016 18:08:48 +0000 (20:08 +0200)
commit6b3d64854f6a7b0c8365b600704f0087b15b5720
tree02c3e1ddfba1ef858e002f640132f0da4aa60644tree | snapshot
parent2bf7bc4161a3b3e1eceaf8422773de87ae233ea3commit | diff
Revert "alas, a map can have only one parent"

This reverts commit d05806fda1cbba2db112bc783597fbe9d27175b2.

This had already been fixed by using `make-composed-map'.  And
we don't want image-map to inherit from special-mode-map, anyway.
lisp/image-mode.el diff | blob | history
lisp/image.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.