Mercurial > emacs
view lisp/vt-control.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 | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; vt-control.el --- Common VTxxx control functions ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> ;; Keywords: terminals ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; The functions contained in this file send various VT control codes ;; to the terminal where emacs is running. The following functions are ;; available. ;; Function Action ;; vt-wide set wide screen (132 characters) ;; vt-narrow set narrow screen (80 characters) ;; vt-toggle-screen toggle wide/narrow screen ;; vt-keypad-on set applications keypad on ;; vt-keypad-off set applications keypad off ;; vt-numlock toggle applications keypad on/off ;;; Usage: ;; To use enable these functions, simply load this file. ;; Note: vt-control makes no effort to determine how the terminal is ;; initially set. It assumes the terminal starts with a width ;; of 80 characters and the applications keypad enabled. Nor ;; does vt-control try to restore the terminal when emacs is ;; killed or suspended. ;;; Code: ;;; Global variables (defvar vt-applications-keypad-p t "If non-nil, keypad is in applications mode.") (defvar vt-wide-p nil "If non-nil, the screen is 132 characters wide.") ;;; Screen width functions. (defun vt-wide nil "Set the screen 132 characters wide." (interactive) (send-string-to-terminal "\e[?3h") (set-frame-width (selected-frame) 132) (setq vt-wide-p t)) (defun vt-narrow nil "Set the screen 80 characters wide." (interactive) (send-string-to-terminal "\e[?3l") (set-frame-width (selected-frame) 80) (setq vt-wide-p nil)) (defun vt-toggle-screen nil "Toggle between 80 and 132 character screen width." (interactive) (if vt-wide-p (vt-narrow) (vt-wide))) ;;; Applications keypad functions. (defun vt-keypad-on (&optional tell) "Turn on the VT applications keypad." (interactive) (send-string-to-terminal "\e=") (setq vt-applications-keypad-p t) (if (or tell (called-interactively-p 'interactive)) (message "Applications keypad enabled."))) (defun vt-keypad-off (&optional tell) "Turn off the VT applications keypad." (interactive "p") (send-string-to-terminal "\e>") (setq vt-applications-keypad-p nil) (if (or tell (called-interactively-p 'interactive)) (message "Applications keypad disabled."))) (defun vt-numlock nil "Toggle VT application keypad on and off." (interactive) (if vt-applications-keypad-p (vt-keypad-off (called-interactively-p 'interactive)) (vt-keypad-on (called-interactively-p 'interactive)))) (provide 'vt-control) ;; arch-tag: d4fed1bf-2524-4ba1-a4fe-86bca3d928a2 ;;; vt-control.el ends here