Mercurial > emacs
annotate .bzrignore @ 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 | 22e354ac21fd |
children | 6719c75fa3ac |
rev | line source |
---|---|
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
1 ./bin |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
2 ./BIN |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
3 ./data |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
4 ./etc/icons |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
5 ./lock |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
6 ./site-lisp |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
7 ./_dir-locals.el |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
8 ./config.log |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
9 ./config.status |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
10 oo |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
11 oo-spd |
107941
171da9949036
Add nextstep/Emacs.app, *.dSYM (OS X compilation artifacts) to .bzrignore.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
107066
diff
changeset
|
12 *.dSYM |
106654 | 13 *.elc |
106809
5cb0f4fd512e
* .bzrignore: Ignore all .exe, instead of individual files.
Juanma Barranquero <lekktu@gmail.com>
parents:
106705
diff
changeset
|
14 *.exe |
108874
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
15 autom4te.cache |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
16 confdefs.h |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
17 configure.lineno |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
18 conftest* |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
19 core |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
20 DOC |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
21 DOC-* |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
22 makefile |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
23 Makefile |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
24 Makefile.c |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
25 stamp_BLD |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
26 subdirs.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
27 TAGS |
107066
3b5ef09ea743
* .bzrignore: Add TAGS-LISP.
Juri Linkov <juri@jurta.org>
parents:
106972
diff
changeset
|
28 TAGS-LISP |
106654 | 29 info/* |
108874
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
30 admin/unidata/unidata.txt |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
31 leim/leim-list.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
32 leim/quail/*.el |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
33 leim/changed.misc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
34 leim/changed.tit |
108874
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
35 lib-src/stamp-* |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
36 lib-src/ctags.c |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
37 lib-src/echolisp.tmp |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
38 lib-src/getopt.h |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
39 lib-src/b2m |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
40 lib-src/ctags |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
41 lib-src/digest-doc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
42 lib-src/ebrowse |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
43 lib-src/emacsclient |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
44 lib-src/etags |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
45 lib-src/fakemail |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
46 lib-src/hexl |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
47 lib-src/make-docfile |
106705
a7854ddcdd85
.bzrignore: Add 2 more patterns.
Eli Zaretskii <eliz@gnu.org>
parents:
106704
diff
changeset
|
48 lib-src/movemail |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
49 lib-src/profile |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
50 lib-src/sorted-doc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
51 lib-src/test-distrib |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
52 lib-src/update-game-score |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
53 lisp/**/*-loaddefs.el |
106654 | 54 lisp/**/loaddefs.el |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
55 lisp/cus-load.el |
106654 | 56 lisp/eshell/esh-groups.el |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
57 lisp/finder-inf.el |
107941
171da9949036
Add nextstep/Emacs.app, *.dSYM (OS X compilation artifacts) to .bzrignore.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
107066
diff
changeset
|
58 nextstep/Emacs.app |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
59 nt/config.log |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
60 src/_dbxinit |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
61 src/_gdbinit |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
62 src/bootstrap-emacs |
108874
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
63 src/buildobj.h |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
64 src/config.h |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
65 src/deps |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
66 src/emacs |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
67 src/emacs-* |
108874
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
68 src/epaths.h |
22e354ac21fd
Add admin/unidata/unidata.txt.
Juanma Barranquero <lekktu@gmail.com>
parents:
108754
diff
changeset
|
69 src/gdb.ini |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
70 src/prefix-args* |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
71 src/stamp-oldxmenu |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
72 src/temacs |