diff --git a/vim-update.sh b/vim-update.sh
index 4961ece1..fc37e160 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 debug=""
 #debug="echo "
-branches=( "rawhide" "f43" "f42" "f41" )
-releases=( "fc44" "fc43" "fc42" "fc41" )
+branches=( "rawhide" "f43" "f42" )
+releases=( "fc44" "fc43" "fc42" )
 # the first bodhi enabled release is the last without \| - all
 # others need to have \|
-regexps=( "fc44" "fc43" "\|fc42" "\|fc41" )
-bodhi_enabled=( "0" "1" "1" "1" )
+regexps=( "fc44" "fc43" "\|fc42" )
+bodhi_enabled=( "0" "1" "1" )
 needs_update=()
 #releases_regexp=fc28\\\|fc27\\\|fc28
 
diff --git a/vim.spec b/vim.spec
index e0e45657..b2c29f97 100644
--- a/vim.spec
+++ b/vim.spec
@@ -122,6 +122,10 @@ BuildRequires: make
 # screen handling library
 BuildRequires: ncurses-devel
 
+# for building function prototypes
+BuildRequires: python3
+BuildRequires: python3-clang
+
 # for python plugin
 BuildRequires: python3-devel
 
@@ -581,6 +585,9 @@ cp -f %{SOURCE7} %{buildroot}/%{_datadir}/%{name}/vimfiles/template.spec
 rm -f README*.info
 
 cd src
+# related to the issue with `make depend`, auto/osdef.h
+# has to be generated
+make auto/osdef.h auto/gui_gtk_gresources.h auto/wayland/wlr-data-control-unstable-v1.h
 # Adding STRIP=/bin/true, because Vim wants to strip the binaries by himself
 # and put the stripped files into correct dirs. Build system (koji/brew) 
 # does it for us, so there is no need to do it in Vim
@@ -1009,6 +1016,9 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 * Fri Oct 17 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1863-1
 - patchlevel 1863
 
+* Fri Oct 10 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1845-1
+- patchlevel 1845
+
 * Fri Oct 03 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1818-1
 - patchlevel 1818
 
diff --git a/vimrc b/vimrc
index 4842faf2..4ef9d92d 100644
--- a/vimrc
+++ b/vimrc
@@ -54,10 +54,14 @@ if has("autocmd")
   " In text files, always limit the width of text to 78 characters
   " autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
+  " (taken from Vim's defaults.vim)
   autocmd BufReadPost *
-  \ if line("'\"") > 0 && line ("'\"") <= line("$") |
-  \   exe "normal! g'\"" |
-  \ endif
+  \ let line = line("'\"")
+  \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit'
+  \      && index(['xxd', 'gitrebase', 'tutor'], &filetype) == -1
+  \      && !&diff
+  \ |   execute "normal! g`\""
+  \ | endif
   " don't write swapfile on most commonly used directories for NFS mounts or USB sticks
   autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
   " start with spec file template