From f358215bd394e552ea56e2e1699edc47a41b8fa9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 18 May 2012 10:29:54 +0530 Subject: [PATCH] ... --- session.vim | 10 +++++++++- setup/build_environment.py | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/session.vim b/session.vim index 2474265137..2bc23acd88 100644 --- a/session.vim +++ b/session.vim @@ -34,4 +34,12 @@ vipy.session.add_content_browser('r', 'Recipe', vipy.session.regexp_based_matcher(r'title\s*=\s*(?P.+)', 'title', recipe_title_callback)) EOFPY -nnoremap \log :enew<CR>:read ! bzr log -l 500 <CR>:e Changelog.yaml<CR>:e src/calibre/constants.py<CR> +fun! CalibreLog() + enew + read ! bzr log -l 500 + set nomodifiable noswapfile buftype=nofile + edit Changelog.yaml + edit src/calibre/constants.py +endfun + +nnoremap \log :call CalibreLog()<CR> diff --git a/setup/build_environment.py b/setup/build_environment.py index eb34763fb4..82a6421ed5 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -120,7 +120,7 @@ if iswindows: poppler_lib_dirs = consolidate('POPPLER_LIB_DIR', sw_lib_dir) popplerqt4_lib_dirs = poppler_lib_dirs poppler_libs = ['poppler'] - magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.6.6')] + magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.7.6')] magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')] magick_libs = ['CORE_RL_wand_', 'CORE_RL_magick_'] podofo_inc = os.path.join(sw_inc_dir, 'podofo')