Mercurial > emacs
view etc/images/back-arrow.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 | 28718fa5d988 |
children |
line wrap: on
line source
/* XPM */ static char *back_arrow_xpm[] = { "24 24 30 1", " c #000000", ". c #53692A", "X c #59702D", "o c #657255", "O c #6D7A5B", "+ c #6D8839", "@ c #7C9B40", "# c #748261", "$ c #7F8E6B", "% c #818F71", "& c #879772", "* c #8C9A7F", "= c #85A24D", "- c #8BA859", "; c #92AD62", ": c #95A77E", "> c #98AF74", ", c #9BB572", "< c #9BAA87", "1 c #9CAF84", "2 c #A4B690", "3 c #A8BCA6", "4 c #ADBDA0", "5 c #AFC394", "6 c #BAD09D", "7 c #B5C3A9", "8 c #BED2A3", "9 c #D5E1C6", "0 c #FFFFFF", "q c None", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqq qqqqqqqqqqqqq", "qqqqqqqqq qqqqqqqqqqqqq", "qqqqqqqq 9 qqqqqqqqqqqqq", "qqqqqqq 96 qqqqqqqqqq", "qqqqqq 968664% qqqqqqqqq", "qqqqq 966666663 qqqqqqqq", "qqqq <666666666* qqqqqqq", "qqqqq X@@@@@@;67 qqqqqq", "qqqqqq .@@@@@@=6$ qqqqqq", "qqqqqqq .@ X@,2 qqqqqq", "qqqqqqqq X q +-6 qqqqqq", "qqqqqqqqq qq @6 qqqqqq", "qqqqqqqqqq qqq -: qqqqqq", "qqqqqqqqqqqqqq >o qqqqqq", "qqqqqqqqqqqqqq 5 qqqqqqq", "qqqqqqqqqqqqq 1O qqqqqqq", "qqqqqqqqqqqq &# qqqqqqqq", "qqqqqqqqqqqqq qqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq", "qqqqqqqqqqqqqqqqqqqqqqqq"};