view etc/images/mail/repack.xpm @ 109383:dcdf09a52e2c

[[[ * 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)

/* XPM */
static char * repack_xpm[] = {
"24 24 83 1",
" 	c None",
".	c #8F5902",
"+	c #E6D4B7",
"@	c #97610B",
"#	c #E9CC9F",
"$	c #D6B584",
"%	c #BE8835",
"&	c #B98330",
"*	c #CA9442",
"=	c #B47E2B",
"-	c #C48E3B",
";	c #D9A352",
">	c #E6D2B5",
",	c #F5EFE4",
"'	c #E7D7BE",
")	c #C2A473",
"!	c #E1BB81",
"~	c #D19B4A",
"{	c #E8C797",
"]	c #EBDBC2",
"^	c #EFE4D2",
"/	c #D4B078",
"(	c #9B6B1C",
"_	c #9A691A",
":	c #DFBC88",
"<	c #CFA462",
"[	c #85570C",
"}	c #825307",
"|	c #C29147",
"1	c #6A4206",
"2	c #6C470A",
"3	c #DFB677",
"4	c #D5AE74",
"5	c #B2833B",
"6	c #B38338",
"7	c #B28235",
"8	c #BD8A3E",
"9	c #C89548",
"0	c #E1C9A3",
"a	c #DDCCAF",
"b	c #DBC6A6",
"c	c #D0B78B",
"d	c #E5CEAB",
"e	c #D29F52",
"f	c #D29E51",
"g	c #D29F51",
"h	c #D29E50",
"i	c #CF9641",
"j	c #CF9640",
"k	c #CF9740",
"l	c #CF9741",
"m	c #D29B46",
"n	c #D39B46",
"o	c #D29A46",
"p	c #D29B47",
"q	c #D7B074",
"r	c #D59F4C",
"s	c #D69F4C",
"t	c #DDB77E",
"u	c #D8A452",
"v	c #D9A452",
"w	c #D9A351",
"x	c #D8A352",
"y	c #DAB47B",
"z	c #E3BE87",
"A	c #DCA857",
"B	c #DDA857",
"C	c #DCA858",
"D	c #DCA758",
"E	c #DCA757",
"F	c #DDA757",
"G	c #D4A04E",
"H	c #DFBB83",
"I	c #E8C792",
"J	c #D7A354",
"K	c #D8A354",
"L	c #E3C08A",
"M	c #EED5AC",
"N	c #ECCD9E",
"O	c #ECCD9D",
"P	c #E5CBA0",
"Q	c #7D510A",
"R	c #764800",
"                        ",
"             ..         ",
"             .+@        ",
"             .#$@       ",
"             .#%$@.     ",
"             .#&*$@.    ",
"    ..........#=-;>.    ",
"    .,,,,,,,')!*-~{.    ",
"    .,]]]]]^/(_!~~:.    ",
"    .,]]]]]^<[}[!;{.    ",
"    .],,,,,,|11223{.    ",
"    .45678890abbbcd.    ",
"    .4efghhhhhhhhh4.    ",
"    .4ijijjkklkljl4.    ",
"    .4mnnmopmompmp4.    ",
"    .qrssssrsssrsr4.    ",
"    .tu;vvvvwuxw;~y.    ",
"    .zABCABCACDEFGH.    ",
"    .IJJKJKJJKJKJKL.    ",
"    .MNNNNNNNNNNONP.    ",
"    Q..............R    ",
"                        ",
"                        ",
"                        "};