Mercurial > emacs

view nt/ftime.bat @ 109383:dcdf09a52e2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[[[ * lisp/bookmark.el (bookmark-bmenu-switch-other-window, bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override ambient binding of `bookmark-automatically-show-annotations'. (Bug #6515) ]]] === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2010-04-14 15:07:53 +0000 +++ lisp/bookmark.el 2010-06-27 03:40:14 +0000 @@ -1860,8 +1860,7 @@ (pop-up-windows t)) (delete-other-windows) (switch-to-buffer (other-buffer)) - (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed? - (bookmark--jump-via bmrk 'pop-to-buffer)) + (bookmark--jump-via bmrk 'pop-to-buffer) (bury-buffer menu))) @@ -1875,8 +1874,7 @@ "Select this line's bookmark in other window, leaving bookmark menu visible." (interactive) (let ((bookmark (bookmark-bmenu-bookmark))) - (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? - (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))) + (bookmark--jump-via bookmark 'switch-to-buffer-other-window))) (defun bookmark-bmenu-switch-other-window () @@ -1887,8 +1885,7 @@ (pop-up-windows t) same-window-buffer-names same-window-regexps) - (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed? - (bookmark--jump-via bookmark 'display-buffer)))) + (bookmark--jump-via bookmark 'display-buffer))) (defun bookmark-bmenu-other-window-with-mouse (event) "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible." === modified file 'lisp/saveplace.el' --- lisp/saveplace.el 2010-01-13 08:35:10 +0000 +++ lisp/saveplace.el 2010-02-07 23:14:52 +0000 @@ -213,7 +213,7 @@ (symbol-name coding-system-for-write))) (let ((print-length nil) (print-level nil)) - (print save-place-alist (current-buffer))) + (pp save-place-alist (current-buffer))) (let ((version-control (cond ((null save-place-version-control) nil)
author Karl Fogel <kfogel@red-bean.com>
date Tue, 13 Jul 2010 18:09:20 -0400
parents 93ce5f375b46
children 375f2633d815 ef719132ddfa
line wrap: on
line source

@echo off
if (%1)==() echo Usage: %0 tracefile
if (%1)==() goto done
rem Need to fiddle with the dumped image so prep doesn't break it
obj\i386\preprep ..\src\obj\i386\emacs.exe ..\src\obj\i386\pemacs.exe
copy ..\src\obj\i386\temacs.map ..\src\obj\i386\pemacs.map
rem -----------------------------------------------------------------
rem    Use this version to profile explicit commands only.
prep /om /ft /sf _Fexecute_extended_command ..\src\obj\i386\pemacs
rem -----------------------------------------------------------------
rem    Use this version to ignore startup code
rem prep /om /ft /sf _command_loop_1 ..\src\obj\i386\pemacs
rem -----------------------------------------------------------------
rem    Use this version to include startup code
rem prep /om /ft ..\src\obj\i386\pemacs
rem -----------------------------------------------------------------
if errorlevel 1 goto done
profile ..\src\obj\i386\pemacs %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel 1 goto done
prep /m  ..\src\obj\i386\pemacs
if errorlevel 1 goto done
plist ..\src\obj\i386\pemacs > %1
:done

goto skipArchTag
   arch-tag: d1c629de-9172-4d72-ab68-9d45ab9903cc
:skipArchTag