annotate etc/images/sort-ascending.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 * sort_ascending_xpm[] = {
"24 24 34 1",
" 	c None",
".	c #000000",
"+	c #FAFAFA",
"@	c #DDDFD2",
"#	c #8B8E7C",
"$	c #E5E7DD",
"%	c #84A77E",
"&	c #586546",
"*	c #81A57C",
"=	c #EDEEE8",
"-	c #81A57B",
";	c #ECEDE6",
">	c #7EA379",
",	c #7DA377",
"'	c #DDDFD3",
")	c #7DA378",
"!	c #C9D5C4",
"~	c #7EA378",
"{	c #7C7E73",
"]	c #DFE7DE",
"^	c #CCDACA",
"/	c #90B08C",
"(	c #76986D",
"_	c #6C855E",
":	c #22231E",
"<	c #3F443B",
"[	c #C8D8C7",
"}	c #9DB89A",
"|	c #76966B",
"1	c #3D4237",
"2	c #565B4E",
"3	c #9EBA9A",
"4	c #3C4237",
"5	c #5E6154",
"                        ",
"                        ",
"                        ",
"               ....     ",
"     .....    ..  ..    ",
"     .+@#.    ..  ..    ",
"     .$%&.    ......    ",
"     .$*&.    ..  ..    ",
"     .=-&.    ..  ..    ",
"     .;-&.              ",
"     .$*&.      ..      ",
"     .$*&.      ..      ",
"     .$>&.              ",
"     .$,&.      ..      ",
"     .')&.      ..      ",
"   ...!~&...            ",
"   .{]^/(_:.  ......    ",
"    .<[}|1.      ...    ",
"     .234.      ...     ",
"      .5.      ...      ",
"       .      ...       ",
"              ......    ",
"                        ",
"                        "};