Mercurial > emacs

view etc/images/cut.xpm @ 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 28718fa5d988
children
line wrap: on
line source

/* XPM */
static char * cut_xpm[] = {
"24 24 40 1",
" 	c None",
".	c #000000",
"+	c #C9C7C2",
"@	c #E6E4E0",
"#	c #EFEEED",
"$	c #494946",
"%	c #73726E",
"&	c #F0EEED",
"*	c #7F7D75",
"=	c #F2F1EF",
"-	c #D2CFC8",
";	c #E7E7E4",
">	c #BAB5AB",
",	c #565653",
"'	c #EDECE9",
")	c #A4A097",
"!	c #817F7E",
"~	c #4E4C48",
"{	c #F6F5F4",
"]	c #474541",
"^	c #EFEEEC",
"/	c #8C8B8A",
"(	c #F3F2F0",
"_	c #77746D",
":	c #323232",
"<	c #EBEBEA",
"[	c #605D58",
"}	c #F5F4F3",
"|	c #CECCC7",
"1	c #363634",
"2	c #6F6E6D",
"3	c #BEBDBB",
"4	c #EAE7E4",
"5	c #B8B5B1",
"6	c #474747",
"7	c #DAD8D4",
"8	c #9B9996",
"9	c #161615",
"0	c #6D6B6A",
"a	c #3A3837",
"                        ",
"                        ",
"      .        .        ",
"      .        .        ",
"     .+.      .@.       ",
"     .#$      %@.       ",
"     .&*.    .=-.       ",
"     .;>,    %').       ",
"      !#*.  .=-~        ",
"      .{>]  ~^>.        ",
"       /(_.:<-[         ",
"       .}|123>.         ",
"        .456>.          ",
"         .78..          ",
"         .90a.          ",
"     .............      ",
"     . ...  ... ...     ",
"    ..  ..   ..  ..     ",
"    .    .   .    .     ",
"    ..  ..   ..  ..     ",
"     ....     .. .      ",
"     ....     ....      ",
"                        ",
"                        "};