Mercurial > emacs

annotate .dir-locals.el @ 109383:dcdf09a52e2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[[[ * 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 340849d761a5
children 2c36d4f54456
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
101014
49524a62e7d6 Don't set indent-tabs-mode.
Glenn Morris <rgm@gnu.org>
parents: 100718
diff changeset
1 ((nil . ((tab-width . 8)
100718
0a3d5993b567 Remove non-working entry for pmail.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100687
diff changeset
2 (fill-column . 70)))
100672
38e7317321ea * make-dist (tempdir): Distribute .dir-locals.el.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
3 (c-mode . ((c-file-style . "GNU")))
100718
0a3d5993b567 Remove non-working entry for pmail.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100687
diff changeset
4 (change-log-mode . ((add-log-time-zone-rule . t)
101158
4a6ff510dcf9 (change-log-mode): Add bug-reference-url-format and bug-reference-mode.
Juri Linkov <juri@jurta.org>
parents: 101014
diff changeset
5 (fill-column . 74)
106607
55134161b319 (bug-reference-url-format): Change to debbugs.gnu.org.
Glenn Morris <rgm@gnu.org>
parents: 105015
diff changeset
6 (bug-reference-url-format . "http://debbugs.gnu.org/%s")
107432
340849d761a5 * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106607
diff changeset
7 (mode . bug-reference)))
340849d761a5 * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106607
diff changeset
8 (diff-mode . ((mode . whitespace))))
100687
245c01516a02 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 100672
diff changeset
9
245c01516a02 Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents: 100672
diff changeset
10 ;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd