Mercurial > emacs
view etc/images/mail/reply.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_mail_reply_xpm[] = { "24 24 67 1", " c None", ". c #000000", "+ c #535353", "@ c #FFFFFF", "# c #FEFEFE", "$ c #FDFDFD", "% c #FCFCFC", "& c #FBFBFB", "* c #F9F9F9", "= c #F8F8F8", "- c #F7F7F7", "; c #F6F6F6", "> c #F5F5F5", ", c #F4F4F4", "' c #E3E3E3", ") c #EEEEEE", "! c #4F4F4F", "~ c #F3F3F3", "{ c #F2F2F2", "] c #F1F1F1", "^ c #F0F0F0", "/ c #EFEFEF", "( c #EDEDED", "_ c #AEAEAE", ": c #E4E4E4", "< c #434343", "[ c #ACACAC", "} c #C8C8C8", "| c #A0A0A0", "1 c #D4D4D4", "2 c #ECECEC", "3 c #959595", "4 c #3E3E3E", "5 c #4D4D4D", "6 c #818181", "7 c #C6C6C6", "8 c #3D1A13", "9 c #6A6A6A", "0 c #636363", "a c #B9B9B9", "b c #737373", "c c #EAC0BA", "d c #7C7C7C", "e c #DF9E95", "f c #E0A198", "g c #E1A59D", "h c #E2A79E", "i c #E3ABA3", "j c #E3AAA2", "k c #CC6253", "l c #DD978D", "m c #DF9F97", "n c #DE9A90", "o c #DD968C", "p c #DD948A", "q c #B14334", "r c #BCBCBC", "s c #431913", "t c #EAC2BC", "u c #DF9C92", "v c #DD998F", "w c #B54535", "x c #65261D", "y c #983A2C", "z c #7C2F24", "A c #63251D", "B c #6C291F", " ", " ", " ", " ................. ", " .+@@@@#$%&*=-;>,'+. ", " .)!@>,~{{]^^/)('!_. ", " .@:<$~{{]^/))('![}. ", " .@>:!&]^^/)(('<|1}. ", " .@&>:<=^/)(2'!31:}. ", " .@>>>:4>)(2'567::}. ", " .@&8>:9<~2'!977>:}. ", " .@..:0@a!^!37b7>:}. ", " ..c.0@>:1![7::d::}. ", " .ce.......:>>>:d:}. ", " .cfghihjek.::::::d}. ", " .clmenoonpq.rrrrrrr0. ", "stnuvvlnnnnw.......... ", " .xyyyyyyyyz. ", " .xyyAAAAAB. ", " .xy....... ", " .x. ", " .. ", " . ", " "};