diff --git a/nvim/plugin/editing.vim b/nvim/plugin/editing.vim
index 817f7cc..c042cd2 100644
--- a/nvim/plugin/editing.vim
+++ b/nvim/plugin/editing.vim
@@ -152,6 +152,11 @@ set commentstring=//%s
       \|xmap # <Cmd>call <SID>VisualStarSearch('?')<CR>N
   augroup END
 
+  " <https://vim.fandom.com/wiki/Searching_for_expressions_which_include_slashes#Searching_for_slash_as_normal_text>
+  command! -nargs=+ Search let @/ = escape(<q-args>, '/') | normal /<C-R>/<CR>
+  " <https://vim.fandom.com/wiki/Searching_for_expressions_which_include_slashes#Searching_for_all_characters_as_normal_text>
+  command! -nargs=+ SearchLiteral let @/ = '\V'.escape(<q-args>, '/\') | normal /<C-R>/<CR>
+
 " }}}
 
 
diff --git a/nvim/plugin/files.vim b/nvim/plugin/files.vim
index f07659f..b9266d5 100644
--- a/nvim/plugin/files.vim
+++ b/nvim/plugin/files.vim
@@ -144,9 +144,9 @@ nnoremap <silent><expr> <CR> empty(&buftype) ? ":write<bar>wall\<CR>" : "\<CR>"
     function s:FixWhitespaceOnSave()
       let l:pos = getpos('.')
       " remove trailing whitespace
-      %s/\s\+$//e
+      keeppatterns %s/\s\+$//e
       " remove trailing newlines
-      %s/\($\n\s*\)\+\%$//e
+      keeppatterns %s/\($\n\s*\)\+\%$//e
       call setpos('.', l:pos)
     endfunction
   " }}}
diff --git a/zsh/functions.zsh b/zsh/functions.zsh
index 88edb32..e008988 100644
--- a/zsh/functions.zsh
+++ b/zsh/functions.zsh
@@ -83,6 +83,7 @@ declare -A date_formats=(
   compact   '%Y%m%d%H%M%S'
   only-date '%Y-%m-%d'
   only-time '%H:%M:%S'
+  timestamp '%s'
 )
 
 for format_name format in "${(kv)date_formats[@]}"; do