diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..d1b51d8
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.project b/.project
new file mode 100644
index 0000000..cdd8d0a
--- /dev/null
+++ b/.project
@@ -0,0 +1,18 @@
+
+
+ TimeStamper
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.groovy.core.groovyNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/TimeStamper.iml b/TimeStamper.iml
old mode 100755
new mode 100644
index 25c35e2..1d1dd7e
--- a/TimeStamper.iml
+++ b/TimeStamper.iml
@@ -28,7 +28,7 @@
-
+
diff --git a/TimeStamper.ipr b/TimeStamper.ipr
old mode 100755
new mode 100644
index cd7931d..4b1dc82
--- a/TimeStamper.ipr
+++ b/TimeStamper.ipr
@@ -10,51 +10,53 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
diff --git a/TimeStamper.iws b/TimeStamper.iws
old mode 100755
new mode 100644
diff --git a/TimeStamper.launch b/TimeStamper.launch
old mode 100755
new mode 100644
diff --git a/TimeStamper.tmproj b/TimeStamper.tmproj
old mode 100755
new mode 100644
diff --git a/application.properties b/application.properties
index d300eba..843029c 100755
--- a/application.properties
+++ b/application.properties
@@ -1,4 +1,5 @@
-#Thu Dec 17 08:19:45 CST 2009
-app.version=2.0
-app.griffon.version=0.2
-app.name=TimeStamper
+#Do not edit app.griffon.* properties, they may change automatically. DO NOT put application configuration in here, it is not the right place!
+#Thu Apr 01 22:28:40 CDT 2010
+app.version=2.0
+app.griffon.version=0.2.1
+app.name=TimeStamper
diff --git a/griffon-app/conf/Application.groovy b/griffon-app/conf/Application.groovy
index dd9b45a..c5110a0 100755
--- a/griffon-app/conf/Application.groovy
+++ b/griffon-app/conf/Application.groovy
@@ -1,33 +1,22 @@
application {
- title='TimeStamper'
- startupGroups = ['TimeStamperMain']
-
- // Should Griffon exit when no Griffon created frames are showing?
- autoShutdown = true
-
- // If you want some non-standard application class, apply it here
- //frameClass = 'javax.swing.JFrame'
+ title="TimeStamper"
+ startupGroups=["TimeStamperMain"]
+ autoShutdown=true
}
mvcGroups {
- // MVC Group for "com.jdbernard.timestamper.TimeStamperMain"
- 'TimeStamperMain' {
- model = 'com.jdbernard.timestamper.TimeStamperMainModel'
- view = 'com.jdbernard.timestamper.TimeStamperMainView'
- controller = 'com.jdbernard.timestamper.TimeStamperMainController'
- }
-
- // MVC Group for "com.jdbernard.timestamper.PunchcardDialog"
- 'PunchcardDialog' {
- model = 'com.jdbernard.timestamper.PunchcardDialogModel'
- view = 'com.jdbernard.timestamper.PunchcardDialogView'
- controller = 'com.jdbernard.timestamper.PunchcardDialogController'
- }
-
- // MVC Group for "com.jdbernard.timestamper.NotesDialog"
- 'NotesDialog' {
- model = 'com.jdbernard.timestamper.NotesDialogModel'
- view = 'com.jdbernard.timestamper.NotesDialogView'
- controller = 'com.jdbernard.timestamper.NotesDialogController'
- }
-
+ TimeStamperMain {
+ model="com.jdbernard.timestamper.TimeStamperMainModel"
+ view="com.jdbernard.timestamper.TimeStamperMainView"
+ controller="com.jdbernard.timestamper.TimeStamperMainController"
+ }
+ PunchcardDialog {
+ model="com.jdbernard.timestamper.PunchcardDialogModel"
+ view="com.jdbernard.timestamper.PunchcardDialogView"
+ controller="com.jdbernard.timestamper.PunchcardDialogController"
+ }
+ NotesDialog {
+ model="com.jdbernard.timestamper.NotesDialogModel"
+ view="com.jdbernard.timestamper.NotesDialogView"
+ controller="com.jdbernard.timestamper.NotesDialogController"
+ }
}
diff --git a/griffon-app/resources/griffon-icon-128x128.png b/griffon-app/resources/griffon-icon-128x128.png
deleted file mode 100755
index b0b4327..0000000
Binary files a/griffon-app/resources/griffon-icon-128x128.png and /dev/null differ
diff --git a/griffon-app/resources/griffon-icon-16x16.png b/griffon-app/resources/griffon-icon-16x16.png
deleted file mode 100755
index 90e269e..0000000
Binary files a/griffon-app/resources/griffon-icon-16x16.png and /dev/null differ
diff --git a/griffon-app/resources/griffon-icon-24x24.png b/griffon-app/resources/griffon-icon-24x24.png
deleted file mode 100755
index 0d1bb73..0000000
Binary files a/griffon-app/resources/griffon-icon-24x24.png and /dev/null differ
diff --git a/griffon-app/resources/griffon-icon-256x256.png b/griffon-app/resources/griffon-icon-256x256.png
deleted file mode 100755
index 3cdabd2..0000000
Binary files a/griffon-app/resources/griffon-icon-256x256.png and /dev/null differ
diff --git a/griffon-app/resources/griffon-icon-32x32.png b/griffon-app/resources/griffon-icon-32x32.png
deleted file mode 100755
index 2c9c1e1..0000000
Binary files a/griffon-app/resources/griffon-icon-32x32.png and /dev/null differ
diff --git a/griffon-app/resources/griffon-icon-48x48.png b/griffon-app/resources/griffon-icon-48x48.png
deleted file mode 100755
index 3577b8e..0000000
Binary files a/griffon-app/resources/griffon-icon-48x48.png and /dev/null differ
diff --git a/griffon-app/resources/griffon-icon-64x64.png b/griffon-app/resources/griffon-icon-64x64.png
deleted file mode 100755
index fe403f8..0000000
Binary files a/griffon-app/resources/griffon-icon-64x64.png and /dev/null differ
diff --git a/griffon-app/resources/griffon.png b/griffon-app/resources/griffon.png
deleted file mode 100755
index 4a38291..0000000
Binary files a/griffon-app/resources/griffon.png and /dev/null differ
diff --git a/griffon-app/resources/log4j.properties b/griffon-app/resources/log4j.properties
index 5d2634f..43ba9fb 100644
--- a/griffon-app/resources/log4j.properties
+++ b/griffon-app/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger=trace, stdout
+log4j.rootLogger=info, stdout, fileout
# set up stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/griffon-app/session.vim b/griffon-app/session.vim
index aa286f3..49e394a 100644
--- a/griffon-app/session.vim
+++ b/griffon-app/session.vim
@@ -1,32 +1,43 @@
let SessionLoad = 1
if &cp | set nocp | endif
+let s:cpo_save=&cpo
+set cpo&vim
+inoremap
nmap v :call Screen_Vars()
nmap vip
vmap {j"ry} :call Send_to_Screen(@r)
-let s:cpo_save=&cpo
-set cpo&vim
-map \dk DirDiffPrev
-map \dj DirDiffNext
-map \dp DirDiffPut
map \dg DirDiffGet
+map \dp DirDiffPut
+map \dj DirDiffNext
+map \dk DirDiffPrev
nmap gx NetrwBrowseX
nnoremap NetrwBrowseX :call netrw#NetrwBrowseX(expand(""),0)
let &cpo=s:cpo_save
unlet s:cpo_save
set autoindent
set backspace=indent,eol,start
+set errorformat=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
set expandtab
+set fileencodings=ucs-bom,utf-8,default,latin1
+set helplang=en
set history=50
set hlsearch
+set iminsert=0
+set imsearch=0
set incsearch
+set makeprg=ant
+set nomodeline
+set printoptions=paper:letter
set ruler
+set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim72,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
set shiftwidth=4
set showcmd
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
set tabstop=4
let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0
let v:this_session=expand(":p")
silent only
-cd ~/My\ Documents/Projects/Non-Gemalto/TimeStamper-griffon/griffon-app
+cd ~/projects/TimeStamper/griffon-app
if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
let s:wipebuf = bufnr('%')
endif
@@ -34,13 +45,13 @@ set shortmess=aoO
badd +88 views/com/jdbernard/timestamper/TimeStamperMainView.groovy
badd +24 models/com/jdbernard/timestamper/TimeStamperMainModel.groovy
badd +64 controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy
-badd +27 views/com/jdbernard/timestamper/NotesDialogView.groovy
+badd +1 views/com/jdbernard/timestamper/NotesDialogView.groovy
badd +8 models/com/jdbernard/timestamper/NotesDialogModel.groovy
badd +1 controllers/com/jdbernard/timestamper/NotesDialogController.groovy
badd +1 views/com/jdbernard/timestamper/PunchcardDialogView.groovy
badd +7 models/com/jdbernard/timestamper/PunchcardDialogModel.groovy
badd +1 controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy
-badd +215 ../src/main/com/jdbernard/timestamper/gui/TimelineDayDisplay.java
+badd +1 ../src/main/com/jdbernard/timestamper/gui/TimelineDayDisplay.java
badd +8 ../src/main/com/jdbernard/timestamper/gui/WindowInformation.groovy
badd +28 conf/Application.groovy
badd +1 conf/Builder.groovy
@@ -66,15 +77,16 @@ set nosplitbelow
set nosplitright
wincmd t
set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 89 + 118) / 237)
-exe '2resize ' . ((&lines * 26 + 46) / 92)
-exe 'vert 2resize ' . ((&columns * 147 + 118) / 237)
-exe '3resize ' . ((&lines * 62 + 46) / 92)
-exe 'vert 3resize ' . ((&columns * 147 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe '2resize ' . ((&lines * 23 + 40) / 81)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+exe '3resize ' . ((&lines * 54 + 40) / 81)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
argglobal
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -166,7 +178,7 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 92 - ((88 * winheight(0) + 44) / 89)
+let s:l = 92 - ((28 * winheight(0) + 39) / 78)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
@@ -178,6 +190,7 @@ edit models/com/jdbernard/timestamper/TimeStamperMainModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -269,7 +282,7 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 23 - ((21 * winheight(0) + 13) / 26)
+let s:l = 23 - ((19 * winheight(0) + 11) / 23)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
@@ -281,6 +294,7 @@ edit controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -372,18 +386,18 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 38 - ((34 * winheight(0) + 31) / 62)
+let s:l = 38 - ((0 * winheight(0) + 27) / 54)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
38
normal! 033l
wincmd w
-exe 'vert 1resize ' . ((&columns * 89 + 118) / 237)
-exe '2resize ' . ((&lines * 26 + 46) / 92)
-exe 'vert 2resize ' . ((&columns * 147 + 118) / 237)
-exe '3resize ' . ((&lines * 62 + 46) / 92)
-exe 'vert 3resize ' . ((&columns * 147 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe '2resize ' . ((&lines * 23 + 40) / 81)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+exe '3resize ' . ((&lines * 54 + 40) / 81)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
tabedit views/com/jdbernard/timestamper/NotesDialogView.groovy
set splitbelow splitright
wincmd _ | wincmd |
@@ -398,15 +412,16 @@ set nosplitbelow
set nosplitright
wincmd t
set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 85 + 118) / 237)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
-exe 'vert 2resize ' . ((&columns * 151 + 118) / 237)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
-exe 'vert 3resize ' . ((&columns * 151 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
argglobal
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -498,18 +513,19 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 16 - ((15 * winheight(0) + 44) / 89)
+let s:l = 1 - ((0 * winheight(0) + 39) / 78)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
-16
-normal! 022l
+1
+normal! 0
wincmd w
argglobal
edit models/com/jdbernard/timestamper/NotesDialogModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -601,18 +617,19 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 7 - ((6 * winheight(0) + 7) / 14)
+let s:l = 1 - ((0 * winheight(0) + 6) / 12)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
-7
-normal! 07l
+1
+normal! 0
wincmd w
argglobal
edit controllers/com/jdbernard/timestamper/NotesDialogController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -704,18 +721,18 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 16 - ((15 * winheight(0) + 37) / 74)
+let s:l = 1 - ((0 * winheight(0) + 32) / 65)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
-16
-normal! 04l
+1
+normal! 0
wincmd w
-exe 'vert 1resize ' . ((&columns * 85 + 118) / 237)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
-exe 'vert 2resize ' . ((&columns * 151 + 118) / 237)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
-exe 'vert 3resize ' . ((&columns * 151 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
tabedit views/com/jdbernard/timestamper/PunchcardDialogView.groovy
set splitbelow splitright
wincmd _ | wincmd |
@@ -730,15 +747,16 @@ set nosplitbelow
set nosplitright
wincmd t
set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 83 + 118) / 237)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
-exe 'vert 2resize ' . ((&columns * 153 + 118) / 237)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
-exe 'vert 3resize ' . ((&columns * 153 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
argglobal
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -830,7 +848,7 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 7 - ((5 * winheight(0) + 44) / 89)
+let s:l = 7 - ((4 * winheight(0) + 39) / 78)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
@@ -842,6 +860,7 @@ edit models/com/jdbernard/timestamper/PunchcardDialogModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -933,7 +952,7 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 8 - ((7 * winheight(0) + 7) / 14)
+let s:l = 8 - ((6 * winheight(0) + 6) / 12)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
@@ -945,6 +964,7 @@ edit controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -1036,18 +1056,18 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 1 - ((0 * winheight(0) + 37) / 74)
+let s:l = 1 - ((0 * winheight(0) + 32) / 65)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
1
normal! 0
wincmd w
-exe 'vert 1resize ' . ((&columns * 83 + 118) / 237)
-exe '2resize ' . ((&lines * 14 + 46) / 92)
-exe 'vert 2resize ' . ((&columns * 153 + 118) / 237)
-exe '3resize ' . ((&lines * 74 + 46) / 92)
-exe 'vert 3resize ' . ((&columns * 153 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe '2resize ' . ((&lines * 12 + 40) / 81)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+exe '3resize ' . ((&lines * 65 + 40) / 81)
+exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
tabedit conf/Application.groovy
set splitbelow splitright
set nosplitbelow
@@ -1058,6 +1078,7 @@ argglobal
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -1149,7 +1170,7 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 28 - ((27 * winheight(0) + 45) / 90)
+let s:l = 28 - ((24 * winheight(0) + 39) / 79)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
@@ -1165,12 +1186,13 @@ set nosplitbelow
set nosplitright
wincmd t
set winheight=1 winwidth=1
-exe 'vert 1resize ' . ((&columns * 118 + 118) / 237)
-exe 'vert 2resize ' . ((&columns * 118 + 118) / 237)
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
argglobal
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -1271,7 +1293,7 @@ normal zc
normal zc
76
normal zc
-let s:l = 215 - ((214 * winheight(0) + 44) / 89)
+let s:l = 215 - ((188 * winheight(0) + 39) / 78)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
@@ -1283,6 +1305,7 @@ edit ../src/main/com/jdbernard/timestamper/GUIUtil.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
+setlocal balloonexpr=
setlocal nobinary
setlocal bufhidden=
setlocal buflisted
@@ -1374,16 +1397,16 @@ setlocal nowinfixwidth
setlocal wrap
setlocal wrapmargin=0
silent! normal! zE
-let s:l = 127 - ((39 * winheight(0) + 44) / 89)
+let s:l = 1 - ((0 * winheight(0) + 39) / 78)
if s:l < 1 | let s:l = 1 | endif
exe s:l
normal! zt
-127
-normal! 024l
+1
+normal! 0
wincmd w
-exe 'vert 1resize ' . ((&columns * 118 + 118) / 237)
-exe 'vert 2resize ' . ((&columns * 118 + 118) / 237)
-tabnext 2
+exe 'vert 1resize ' . ((&columns * 90 + 91) / 182)
+exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
+tabnext 4
if exists('s:wipebuf')
silent exe 'bwipe ' . s:wipebuf
endif
@@ -1391,7 +1414,7 @@ unlet! s:wipebuf
set winheight=1 winwidth=20 shortmess=filnxtToO
let s:sx = expand(":p:r")."x.vim"
if file_readable(s:sx)
- exe "source " . s:sx
+ exe "source " . fnameescape(s:sx)
endif
let &so = s:so_save | let &siso = s:siso_save
doautoall SessionLoadPost