Mercurial > emacs

view etc/nxml/03190-0319F.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 543b7ec8c4b7
children ef719132ddfa
line wrap: on
line source

(nxml-define-char-name-set 'kanbun
  '(("IDEOGRAPHIC ANNOTATION LINKING MARK" #x3190)
    ("IDEOGRAPHIC ANNOTATION REVERSE MARK" #x3191)
    ("IDEOGRAPHIC ANNOTATION ONE MARK" #x3192)
    ("IDEOGRAPHIC ANNOTATION TWO MARK" #x3193)
    ("IDEOGRAPHIC ANNOTATION THREE MARK" #x3194)
    ("IDEOGRAPHIC ANNOTATION FOUR MARK" #x3195)
    ("IDEOGRAPHIC ANNOTATION TOP MARK" #x3196)
    ("IDEOGRAPHIC ANNOTATION MIDDLE MARK" #x3197)
    ("IDEOGRAPHIC ANNOTATION BOTTOM MARK" #x3198)
    ("IDEOGRAPHIC ANNOTATION FIRST MARK" #x3199)
    ("IDEOGRAPHIC ANNOTATION SECOND MARK" #x319A)
    ("IDEOGRAPHIC ANNOTATION THIRD MARK" #x319B)
    ("IDEOGRAPHIC ANNOTATION FOURTH MARK" #x319C)
    ("IDEOGRAPHIC ANNOTATION HEAVEN MARK" #x319D)
    ("IDEOGRAPHIC ANNOTATION EARTH MARK" #x319E)
    ("IDEOGRAPHIC ANNOTATION MAN MARK" #x319F)
    ))

;; arch-tag: e25f7331-0993-4daf-a193-0fe56332f9fa