Mercurial > emacs
annotate lisp/term/vt220.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 | 528714e93230 |
children | 4bc33ffdda1a ef719132ddfa |
rev | line source |
---|---|
47726
33d53d287ee4
Add "no-byte-compile: t" in first line.
Juanma Barranquero <lekktu@gmail.com>
parents:
38414
diff
changeset
|
1 ;; -*- no-byte-compile: t -*- |
3807 | 2 ;; For our purposes we can treat the vt200 and vt100 almost alike. |
3 ;; Most differences are handled by the termcap entry. | |
64651
af1c58687bdd
* term/apollo.el (terminal-init-apollo): New function containing
Dan Nicolaescu <dann@ics.uci.edu>
parents:
52401
diff
changeset
|
4 (defun terminal-init-vt220 () |
83353
532e0a9335a9
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
5 "Terminal initialization function for vt220." |
83524
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83394
diff
changeset
|
6 (tty-run-terminal-initialization (selected-frame) "vt100") |
64651
af1c58687bdd
* term/apollo.el (terminal-init-apollo): New function containing
Dan Nicolaescu <dann@ics.uci.edu>
parents:
52401
diff
changeset
|
7 ;; Make F11 an escape key. |
85550
528714e93230
(terminal-init-vtNNN): Use input-decode-map.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83524
diff
changeset
|
8 (define-key input-decode-map "\e[23~" [f11]) ;Probably redundant. |
528714e93230
(terminal-init-vtNNN): Use input-decode-map.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83524
diff
changeset
|
9 (define-key local-function-key-map [f11] [?\e])) |
3807 | 10 |
85550
528714e93230
(terminal-init-vtNNN): Use input-decode-map.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83524
diff
changeset
|
11 ;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871 |
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
3807
diff
changeset
|
12 ;;; vt220.el ends here |