From 028a6364d212b9f305c4388c2d476aeb840984fd Mon Sep 17 00:00:00 2001
From: Detlef Groth <dgroth@uni-potsdam.de>
Date: Tue, 20 Aug 2024 08:02:28 +0200
Subject: [PATCH] fixing xfontsel dialog

---
 jasspa/macros/me.emf       | 2 +-
 jasspa/macros/unixterm.emf | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jasspa/macros/me.emf b/jasspa/macros/me.emf
index 617f45f..e6a87a3 100644
--- a/jasspa/macros/me.emf
+++ b/jasspa/macros/me.emf
@@ -48,7 +48,7 @@
 define-macro-file format clean sort-lines-ignore-case normal-tab tabs-to-spaces paragraph-to-line delete-indentation restyle-region restyle-buffer ifill-paragraph indent-increase indent-decrease
 define-macro-file clearcs cc-state cc-update cc-checkout cc-checkin cc-add cc-diff cc-uncheckout cc-annotate cc-describe cc-delete cc-move cc-merge cc-vtree cc-explorer cc-add-view cc-setup
 define-macro-file cvs cvs cvs-setup cvs-add cvs-annotate cvs-checkout cvs-commit cvs-diff cvs-gdiff cvs-log cvs-remove cvs-resolve-conflicts cvs-state cvs-status cvs-tag cvs-update
-define-macro-file git git git-add git-checkout git-commit git-diff git-grep git-log git-pull git-rm git-state git-status git-tag
+define-macro-file git git git-add git-branch git-checkout git-commit git-diff git-grep git-log git-mv git-pull git-rm git-state git-status git-tag
 define-macro-file osdmisc insert-symbol buffer-setup alarm browse alias-path-setup file-type-setup file-tool-setup file-tool-menu shell-tool-setup find-setup
 define-macro-file tools compile which diff rdiff xdiff diff-changes execute-tool uniq find-bfile find-cfile reread-file reread-all save-kbd-macro
 define-macro-file misc save-all encase open-line check-line-length number-items time compare-windows-exact display-whitespaces write-region execute-region
diff --git a/jasspa/macros/unixterm.emf b/jasspa/macros/unixterm.emf
index a449524..4bee348 100644
--- a/jasspa/macros/unixterm.emf
+++ b/jasspa/macros/unixterm.emf
@@ -195,12 +195,12 @@ set-variable .change-font.xfontsel 0
         beginning-of-buffer
         search-buffer "me" "^-"
         !if $status
-            set-variable  .xfontsel.font @wl
-            !if &equ &sin "-*-*" .xfontsel.font 1
+            set-variable .change-font.xfontsel-font @wl
+            !if &equ &sin "-*-*" .change-font.xfontsel-font 1
                 1000 ml-write "No font selected!"
                 !return
             !endif
-            !if &xse .xfontsel.font "\\(-[^-]*-[^-]*-[^-]*-[^-]*-\\)[^-]*-[^-]*-\\([^-]*\\)-[^-]*-[^-]*\\(-[^-]*-\\)[^-]*\\(-.*\\)"
+            !if &xse .change-font.xfontsel-font "\\(-[^-]*-[^-]*-[^-]*-[^-]*-\\)[^-]*-[^-]*-\\([^-]*\\)-[^-]*-[^-]*\\(-[^-]*-\\)[^-]*\\(-.*\\)"
                 set-variable .change-font.sz-font &spr "%s*-*-%%d-*-*%s*%s" @s1 @s3 @s4
                 !if &seq @s2 "*"
                     !if &not &exi .change-font.sz-size
@@ -231,7 +231,7 @@ set-variable .change-font.xfontsel 0
                 !endif
             !else
                 ; should be not reached
-                change-font .xfontself.font
+                change-font .change.font.xfontsel-font
                 set-variable .change-font.sz-font ""
             !endif
         !else