- patchlevel 2068

Fixes setting the cursor at the start of file when committing in Git

sources

@@ -1 +1 @@
-SHA512 (vim-9.1-1723.tar.bz2) = 8e4474f5b693c517658779e31d884f4c74bc2ff424975cfc745680817e007f90e9dd4d860342c8a31a2186a3f3d7ccb1b7b4d23c2dd60c6131056d67d8b2b06b
+SHA512 (vim-9.1-2068.tar.bz2) = f19ae5898f7c388f437fe03af23d956ef66706c2a629a3389622e0b583d9bd831dd4e250badb181fceacb2b52b1f8a6bda4f72fbece122b5f5097153daf774f3

vim-7.4-specsyntax.patch

@@ -1,7 +1,7 @@
 diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
---- vim91/runtime/syntax/spec.vim.spec-syntax	2024-03-08 07:18:14.000000000 +0100
-+++ vim91/runtime/syntax/spec.vim	2024-03-08 07:37:57.157339625 +0100
-@@ -35,7 +35,7 @@ syn match specNoNumberHilite 'X11\|X11R6
+--- vim91/runtime/syntax/spec.vim.spec-syntax	2025-11-14 07:38:27.000000000 +0100
++++ vim91/runtime/syntax/spec.vim	2025-11-14 07:52:56.081212607 +0100
+@@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
  syn match specManpageFile '[a-zA-Z]\.1'
  
  "Day, Month and most used license acronyms
@@ -10,24 +10,12 @@ diff -up vim91/runtime/syntax/spec.vim.spec-syntax vim91/runtime/syntax/spec.vim
  syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
  syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
  syn keyword specMonth   contained January February March April May June July August September October November December
-@@ -58,9 +58,9 @@ syn cluster specListedFiles contains=spe
- 
- "specCommands
- syn match   specConfigure  contained '\./configure'
--syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
-+syn match   specTarCommand contained '\<tar\s\+[cxvpzIjf]\{,5}\s*'
- syn keyword specCommandSpecial contained root
--syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
-+syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch bzip2 bunzip2 gunzip
- syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
- 
- "frequently used rpm env vars
-@@ -102,7 +102,7 @@ syn case ignore
+@@ -105,7 +105,7 @@ syn case ignore
  "%% PreAmble Section %%
  "Copyright and Serial were deprecated by License and Epoch
  syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
--syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
++syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|DistTag\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ModularityLabel\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
  
  "%% Description Section %%
  syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment

vim-crypto-warning.patch

@@ -1,7 +1,7 @@
-diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in
---- vim90/src/config.h.in.fips-warning	2023-05-29 09:30:59.000000000 +0200
-+++ vim90/src/config.h.in	2023-05-29 09:34:47.261645612 +0200
-@@ -498,5 +498,14 @@
+diff -up vim91/src/config.h.in.fips-warning vim91/src/config.h.in
+--- vim91/src/config.h.in.fips-warning	2025-10-31 08:12:59.598267544 +0100
++++ vim91/src/config.h.in	2025-10-31 08:14:45.661859595 +0100
+@@ -526,5 +526,14 @@
  /* Define if _SC_SIGSTKSZ is available via sysconf() */
  #undef HAVE_SYSCONF_SIGSTKSZ
  
@@ -16,10 +16,10 @@ diff -up vim90/src/config.h.in.fips-warning vim90/src/config.h.in
 +
  /* Define if you want to load libgpm dynamically */
  #undef DYNAMIC_GPM
-diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac
---- vim90/src/configure.ac.fips-warning	2023-05-29 09:34:47.257645645 +0200
-+++ vim90/src/configure.ac	2023-05-29 09:34:47.262645604 +0200
-@@ -589,6 +589,38 @@ else
+diff -up vim91/src/configure.ac.fips-warning vim91/src/configure.ac
+--- vim91/src/configure.ac.fips-warning	2025-10-31 08:12:59.596711911 +0100
++++ vim91/src/configure.ac	2025-10-31 08:12:59.598566242 +0100
+@@ -631,6 +631,38 @@ else
    AC_SUBST(XDIFF_OBJS_USED)
  fi
  
@@ -58,10 +58,10 @@ diff -up vim90/src/configure.ac.fips-warning vim90/src/configure.ac
  dnl Check for Lua feature.
  AC_MSG_CHECKING(--enable-luainterp argument)
  AC_ARG_ENABLE(luainterp,
-diff -up vim90/src/crypt.c.fips-warning vim90/src/crypt.c
---- vim90/src/crypt.c.fips-warning	2023-05-29 09:34:47.263645596 +0200
-+++ vim90/src/crypt.c	2023-05-29 09:51:23.209779115 +0200
-@@ -795,6 +795,21 @@ crypt_check_method(int method)
+diff -up vim91/src/crypt.c.fips-warning vim91/src/crypt.c
+--- vim91/src/crypt.c.fips-warning	2025-10-10 07:16:11.000000000 +0200
++++ vim91/src/crypt.c	2025-10-31 08:12:59.598872032 +0100
+@@ -806,6 +806,21 @@ crypt_check_method(int method)
  	msg_scroll = TRUE;
  	msg(_("Warning: Using a weak encryption method; see :help 'cm'"));
      }

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
 

vim.spec

@@ -12,7 +12,7 @@
 %endif
 
 
-%define patchlevel 1723
+%define patchlevel 2068
 %define withnetbeans 1
 
 %define withhunspell 0
@@ -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
 
@@ -315,8 +319,6 @@ BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 # core X11 protocol client library
 BuildRequires: libX11-devel
-# X PixMap library for X11 - for creating images in X PixMap format
-BuildRequires: libXpm-devel
 # X Toolkit Intrinsics library - working with widgets?
 BuildRequires: libXt-devel
 # for testing validity of appdata file
@@ -345,11 +347,6 @@ Requires: vim-common = %{epoch}:%{version}-%{release}
 Suggests: python3
 Suggests: python3-libs
 
-  %if 0%{?fedora} >= 41
-  # needed for icons (#2277751)
-Requires: gdk-pixbuf2-modules-extra%{?_isa}
-  %endif
-
 # suggest python3, python2, lua, ruby and perl packages because of their 
 # embedded functionality in Vim/GVim
   %if "%{withlua}" == "1"
@@ -570,6 +567,7 @@ cp vim enhanced-vim
   --enable-fail-if-missing \
   --with-wayland \
   --enable-year2038 \
+  --enable-socketserver \
   --enable-canberra
 
 %make_build
@@ -587,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
@@ -994,6 +995,42 @@ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
 
 
 %changelog
+* Fri Jan 09 2026 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.2068-1
+- patchlevel 2068
+
+* Fri Dec 19 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1999-1
+- patchlevel 1999
+
+* Fri Dec 12 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1972-1
+- patchlevel 1972
+
+* Fri Dec 05 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1952-1
+- patchlevel 1952
+
+* Fri Nov 14 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1914-1
+- patchlevel 1914
+
+* Fri Oct 31 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1888-1
+- patchlevel 1888
+
+* 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
+
+* Mon Sep 29 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1775-2
+- remove XPM support - GVim icons work without it
+
+* Fri Sep 19 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1775-1
+- patchlevel 1775
+
+* Wed Sep 10 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1723-2
+- Restore lost --remote-tab... functionality on wayland (fedora#2393716)
+
 * Mon Sep 01 2025 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.1.1723-1
 - patchlevel 1723
 

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