Mercurial > emacs
view etc/nxml/00980-009FF.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 | 51937bad10fc |
children | ef719132ddfa |
line wrap: on
line source
(nxml-define-char-name-set 'bengali '(("BENGALI SIGN CANDRABINDU" #x0981) ("BENGALI SIGN ANUSVARA" #x0982) ("BENGALI SIGN VISARGA" #x0983) ("BENGALI LETTER A" #x0985) ("BENGALI LETTER AA" #x0986) ("BENGALI LETTER I" #x0987) ("BENGALI LETTER II" #x0988) ("BENGALI LETTER U" #x0989) ("BENGALI LETTER UU" #x098A) ("BENGALI LETTER VOCALIC R" #x098B) ("BENGALI LETTER VOCALIC L" #x098C) ("BENGALI LETTER E" #x098F) ("BENGALI LETTER AI" #x0990) ("BENGALI LETTER O" #x0993) ("BENGALI LETTER AU" #x0994) ("BENGALI LETTER KA" #x0995) ("BENGALI LETTER KHA" #x0996) ("BENGALI LETTER GA" #x0997) ("BENGALI LETTER GHA" #x0998) ("BENGALI LETTER NGA" #x0999) ("BENGALI LETTER CA" #x099A) ("BENGALI LETTER CHA" #x099B) ("BENGALI LETTER JA" #x099C) ("BENGALI LETTER JHA" #x099D) ("BENGALI LETTER NYA" #x099E) ("BENGALI LETTER TTA" #x099F) ("BENGALI LETTER TTHA" #x09A0) ("BENGALI LETTER DDA" #x09A1) ("BENGALI LETTER DDHA" #x09A2) ("BENGALI LETTER NNA" #x09A3) ("BENGALI LETTER TA" #x09A4) ("BENGALI LETTER THA" #x09A5) ("BENGALI LETTER DA" #x09A6) ("BENGALI LETTER DHA" #x09A7) ("BENGALI LETTER NA" #x09A8) ("BENGALI LETTER PA" #x09AA) ("BENGALI LETTER PHA" #x09AB) ("BENGALI LETTER BA" #x09AC) ("BENGALI LETTER BHA" #x09AD) ("BENGALI LETTER MA" #x09AE) ("BENGALI LETTER YA" #x09AF) ("BENGALI LETTER RA" #x09B0) ("BENGALI LETTER LA" #x09B2) ("BENGALI LETTER SHA" #x09B6) ("BENGALI LETTER SSA" #x09B7) ("BENGALI LETTER SA" #x09B8) ("BENGALI LETTER HA" #x09B9) ("BENGALI SIGN NUKTA" #x09BC) ("BENGALI VOWEL SIGN AA" #x09BE) ("BENGALI VOWEL SIGN I" #x09BF) ("BENGALI VOWEL SIGN II" #x09C0) ("BENGALI VOWEL SIGN U" #x09C1) ("BENGALI VOWEL SIGN UU" #x09C2) ("BENGALI VOWEL SIGN VOCALIC R" #x09C3) ("BENGALI VOWEL SIGN VOCALIC RR" #x09C4) ("BENGALI VOWEL SIGN E" #x09C7) ("BENGALI VOWEL SIGN AI" #x09C8) ("BENGALI VOWEL SIGN O" #x09CB) ("BENGALI VOWEL SIGN AU" #x09CC) ("BENGALI SIGN VIRAMA" #x09CD) ("BENGALI AU LENGTH MARK" #x09D7) ("BENGALI LETTER RRA" #x09DC) ("BENGALI LETTER RHA" #x09DD) ("BENGALI LETTER YYA" #x09DF) ("BENGALI LETTER VOCALIC RR" #x09E0) ("BENGALI LETTER VOCALIC LL" #x09E1) ("BENGALI VOWEL SIGN VOCALIC L" #x09E2) ("BENGALI VOWEL SIGN VOCALIC LL" #x09E3) ("BENGALI DIGIT ZERO" #x09E6) ("BENGALI DIGIT ONE" #x09E7) ("BENGALI DIGIT TWO" #x09E8) ("BENGALI DIGIT THREE" #x09E9) ("BENGALI DIGIT FOUR" #x09EA) ("BENGALI DIGIT FIVE" #x09EB) ("BENGALI DIGIT SIX" #x09EC) ("BENGALI DIGIT SEVEN" #x09ED) ("BENGALI DIGIT EIGHT" #x09EE) ("BENGALI DIGIT NINE" #x09EF) ("BENGALI LETTER RA WITH MIDDLE DIAGONAL" #x09F0) ("BENGALI LETTER RA WITH LOWER DIAGONAL" #x09F1) ("BENGALI RUPEE MARK" #x09F2) ("BENGALI RUPEE SIGN" #x09F3) ("BENGALI CURRENCY NUMERATOR ONE" #x09F4) ("BENGALI CURRENCY NUMERATOR TWO" #x09F5) ("BENGALI CURRENCY NUMERATOR THREE" #x09F6) ("BENGALI CURRENCY NUMERATOR FOUR" #x09F7) ("BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR" #x09F8) ("BENGALI CURRENCY DENOMINATOR SIXTEEN" #x09F9) ("BENGALI ISSHAR" #x09FA) )) ;; arch-tag: 66599f15-c2b7-436a-9737-577d4f041abd