about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2022-05-14 18:23:55 +1200
committeradisbladis <adisbladis@gmail.com>2022-05-14 18:25:58 +1200
commit2686f10fb4b40c5406a7458945d8e41dcbadf240 (patch)
treeeffd90c443561179923207247c626577ab343d98 /pkgs/applications/editors/emacs
parentab139539635773179a49ad91565fe942debf8ab7 (diff)
downloadnixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.tar
nixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.tar.gz
nixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.tar.bz2
nixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.tar.lz
nixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.tar.xz
nixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.tar.zst
nixlib-2686f10fb4b40c5406a7458945d8e41dcbadf240.zip
emacs.pkgs.ement: unstable-2022-05-05 -> unstable-2022-05-14
Diffstat (limited to 'pkgs/applications/editors/emacs')
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/ement/default.nix6
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch14
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
index d6e8de3efad6..f89d0ce8007c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
@@ -13,13 +13,13 @@
 
 trivialBuild {
   pname = "ement";
-  version = "unstable-2022-05-05";
+  version = "unstable-2022-05-14";
 
   src = fetchFromGitHub {
     owner = "alphapapa";
     repo = "ement.el";
-    rev = "84739451afa8355360966dfa788d469d9dc4a8e3";
-    sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE=";
+    rev = "961d650377f9e7440e47c36c0386e899f5b2d86b";
+    sha256 = "sha256-4KTSPgso7UvzCRKNFI3YaPR1t4DUwggO4KtBYLm0W4Y=";
   };
 
   packageRequires = [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
index 547fee164056..271e1cd2dbac 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
+++ b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch
@@ -1,8 +1,8 @@
-diff --git a/ement.el b/ement.el
-index c9596a7..1b33045 100644
---- a/ement.el
-+++ b/ement.el
-@@ -682,14 +682,15 @@ can cause undesirable underlining."
+diff --git a/ement-lib.el b/ement-lib.el
+index f0b2738..025a191 100644
+--- a/ement-lib.el
++++ b/ement-lib.el
+@@ -644,14 +644,15 @@ can cause undesirable underlining."
    "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.
  IMAGE should be one as created by, e.g. `create-image'."
    ;; It would be nice if the image library had some simple functions to do this sort of thing.
@@ -24,5 +24,5 @@ index c9596a7..1b33045 100644
 +            (image-property new-image :max-height) max-height)
 +      new-image)))
  
- ;;;;; Reading/writing sessions
- 
+ (defun ement--room-alias (room)
+   "Return latest m.room.canonical_alias event in ROOM."