Mercurial > emacs
view etc/images/mail/outbox.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)
| author | Karl Fogel <kfogel@red-bean.com> |
|---|---|
| date | Tue, 13 Jul 2010 18:09:20 -0400 |
| parents | ed7704221f2b |
| children |
line wrap: on
line source
/* XPM */ static char * stock_outbox_xpm[] = { "24 24 69 1", " c None", ". c #000000", "+ c #E66040", "@ c #EE937E", "# c #E55E3F", "$ c #E1431F", "% c #EC8770", "& c #F0A08E", "* c #F3B7A9", "= c #EF9985", "- c #E76749", "; c #ED8C75", "> c #F5BEB1", ", c #F3B4A5", "' c #F4B8AA", ") c #F1A593", "! c #E55B3B", "~ c #E45534", "{ c #F4BDB0", "] c #F4BAAC", "^ c #EF9C89", "/ c #E34E2B", "( c #C0391A", "_ c #8A2912", ": c #3E3E3C", "< c #D4D3D2", "[ c #DB411D", "} c #F1A999", "| c #D23E1C", "1 c #812611", "2 c #C7C7C5", "3 c #ACABA8", "4 c #6A6966", "5 c #E9775D", "6 c #CECDCC", "7 c #A93217", "8 c #9B9A97", "9 c #494846", "0 c #9A9996", "a c #BBBBB9", "b c #747370", "c c #A5A4A1", "d c #AAA9A6", "e c #686765", "f c #7D7C79", "g c #686764", "h c #9C9B98", "i c #999895", "j c #ABAAA7", "k c #A9A8A5", "l c #AF3417", "m c #E55D3D", "n c #C5C5C3", "o c #8D8C89", "p c #626260", "q c #B2B1AE", "r c #A7A6A3", "s c #B4B4B2", "t c #C3C3C1", "u c #92918E", "v c #D1D0CF", "w c #373735", "x c #CACAC8", "y c #A8A7A4", "z c #CCCCCA", "A c #52514E", "B c #C8C8C6", "C c #B5B5B3", "D c #7E7D7A", " . ", " .. ", " .+. ", " ....@#. ", " .$%&*=@-. ", " .;>,')@@@!. ", " .~{]*^@@@@@-.", " ...@>/((((((_. ", " .:<.[}|((((((1. ", " ..234.5+(_...(1. ", " ..63444.@(7...._. ", " ..6344448.@(.90a.. ", ".634444bcd.#$.eff.a.. ", ".gh34bijkk.lm.iffff0a. ", ".ggghniikdo..pddiffffq. ", ".ggggghniikdkkkdddiffr. ", " ..ggggghniikdkkdddsta. ", " ..ggggghnurdkksvvw. ", " ..gggggxrdyzvA.. ", " ...gggB3qCA.. ", " ...gDv... ", " ..... ", " ", " "};