Mercurial > emacs
view leim/CXTERM-DIC/README @ 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 | bb025df6fc13 |
children | f83d17e1ace6 |
line wrap: on
line source
All *.tit files in this directory are dictionary files to use with the program cxterm. Their source and copyright status are categorised into these four groups. (1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit) QJ.tit (copied from .../cxterm/dict/gb/QJ.tit) They are verbatim copies of those included in the directory contrib/clients/cxterm of the distribution of X11R6. Each file contains a license notice. (2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit) PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit) SW.tit (copied from .../cxterm/dict/gb/SW.tit) TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit) They are copies of those included in the directory contrib/clients/cxterm of the distribution of X11R6. As the original files don't contain copyright and license notices, a proper notice is extracted from .../cxterm/README and added at the head of each file. (3) 4Corner.tit ARRAY30.tit ETZY.tit ZOZY.tit They are versions modified by the original authors from those distributed with X11R5 to include proper copyright notices. Each file contains a license notice. (4) ECDICT.tit, Punct-b5.tit, Punct.tit They are verbatim copies of those distributed at ftp://ftp.ifcss.org/pub/software/. Each file contains a license notice.