Mercurial > emacs
view etc/nxml/10330-1034F.el @ 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 | 3faf4bfa7d12 |
children | ef719132ddfa |
line wrap: on
line source
(nxml-define-char-name-set 'gothic '(("GOTHIC LETTER AHSA" #x10330) ("GOTHIC LETTER BAIRKAN" #x10331) ("GOTHIC LETTER GIBA" #x10332) ("GOTHIC LETTER DAGS" #x10333) ("GOTHIC LETTER AIHVUS" #x10334) ("GOTHIC LETTER QAIRTHRA" #x10335) ("GOTHIC LETTER IUJA" #x10336) ("GOTHIC LETTER HAGL" #x10337) ("GOTHIC LETTER THIUTH" #x10338) ("GOTHIC LETTER EIS" #x10339) ("GOTHIC LETTER KUSMA" #x1033A) ("GOTHIC LETTER LAGUS" #x1033B) ("GOTHIC LETTER MANNA" #x1033C) ("GOTHIC LETTER NAUTHS" #x1033D) ("GOTHIC LETTER JER" #x1033E) ("GOTHIC LETTER URUS" #x1033F) ("GOTHIC LETTER PAIRTHRA" #x10340) ("GOTHIC LETTER NINETY" #x10341) ("GOTHIC LETTER RAIDA" #x10342) ("GOTHIC LETTER SAUIL" #x10343) ("GOTHIC LETTER TEIWS" #x10344) ("GOTHIC LETTER WINJA" #x10345) ("GOTHIC LETTER FAIHU" #x10346) ("GOTHIC LETTER IGGWS" #x10347) ("GOTHIC LETTER HWAIR" #x10348) ("GOTHIC LETTER OTHAL" #x10349) ("GOTHIC LETTER NINE HUNDRED" #x1034A) )) ;; arch-tag: 29caddb6-76f0-44bc-83f9-6cef55c20600