diff options
| author | Liliana Marie Prikler <[email protected]> | 2022-04-10 13:23:43 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <[email protected]> | 2022-05-14 16:13:30 +0200 |
| commit | b65a1e4a2144f1e7a1b58444f4bf2695783c0166 (patch) | |
| tree | 4a231c6fb23b66b28b556de9edab23d57faa3a6f /gnu/packages/patches/emacs-ignore-empty-xim-styles.patch | |
| parent | c61746b8aa85bc7d69225f47fc56b1f3821b2d00 (diff) | |
gnu: emacs: Update to 28.1.
* gnu/packages/emacs.scm (emacs): Update to 28.1
* gnu/packages/patches/emacs-exec-path.patch: Adjust accordingly.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch: Delete file.
* gnu/local.mk: Remove it here.
Diffstat (limited to 'gnu/packages/patches/emacs-ignore-empty-xim-styles.patch')
| -rw-r--r-- | gnu/packages/patches/emacs-ignore-empty-xim-styles.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch b/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch deleted file mode 100644 index 398e65bdc8..0000000000 --- a/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix contributed upstream here: -https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42694. - -Index: emacs-26.3/src/xfns.c -=================================================================== ---- emacs-26.3.orig/src/xfns.c -+++ emacs-26.3/src/xfns.c -@@ -2628,6 +2628,8 @@ xic_free_xfontset (struct frame *f) - static XIMStyle - best_xim_style (XIMStyles *xim) - { -+ if (xim == NULL) goto out; -+ - int i, j; - int nr_supported = ARRAYELTS (supported_xim_styles); - -@@ -2636,6 +2638,7 @@ best_xim_style (XIMStyles *xim) - if (supported_xim_styles[i] == xim->supported_styles[j]) - return supported_xim_styles[i]; - -+ out: - /* Return the default style. */ - return XIMPreeditNothing | XIMStatusNothing; - } |