Mercurial > emacs
view lisp/t-mouse.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
;;; t-mouse.el --- mouse support within the text terminal ;; Author: Nick Roberts <nickrob@gnu.org> ;; Maintainer: FSF ;; Keywords: mouse gpm linux ;; Copyright (C) 1994, 1995, 1998, 2006, 2007, 2008, 2009, 2010 ;; Free Software Foundation, Inc. ;; 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: ;; This package provides access to mouse event as reported by the gpm-Linux ;; package. It tries to reproduce the functionality offered by Emacs under X. ;; The "gpm" server runs under Linux, so this package is rather ;; Linux-dependent. ;; The file, t-mouse.el was originally written by Alessandro Rubini and Ian T ;; Zimmerman, and Emacs communicated with gpm through a client program called ;; mev. Now the interface with gpm is directly through a Unix socket, so this ;; file is reduced to a single minor mode macro call. ;; ;;; Code: ;; Prevent warning when compiling in an Emacs without gpm support. (declare-function gpm-mouse-start "term.c" ()) (defun gpm-mouse-enable () "Try to enable gpm mouse support on the current terminal." (let ((activated nil)) (unwind-protect (progn (unless (fboundp 'gpm-mouse-start) (error "Emacs must be built with Gpm to use this mode")) (when gpm-mouse-mode (gpm-mouse-start) (set-terminal-parameter nil 'gpm-mouse-active t) (setq activated t))) ;; If something failed to turn it on, try to turn it off as well, ;; just in case. (unless activated (gpm-mouse-disable))))) (defun gpm-mouse-disable () "Try to disable gpm mouse support on the current terminal." (when (fboundp 'gpm-mouse-stop) (gpm-mouse-stop)) (set-terminal-parameter nil 'gpm-mouse-active nil)) ;;;###autoload (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") ;;;###autoload (define-minor-mode gpm-mouse-mode "Toggle gpm-mouse mode to use the mouse in GNU/Linux consoles. With prefix arg, turn gpm-mouse mode on if arg is positive, otherwise turn it off. This allows the use of the mouse when operating on a GNU/Linux console, in the same way as you can use the mouse under X11. It relies on the `gpm' daemon being activated." :global t :group 'mouse :init-value t (dolist (terminal (terminal-list)) (when (and (eq t (terminal-live-p terminal)) (not (eq gpm-mouse-mode (terminal-parameter terminal 'gpm-mouse-active)))) ;; Simulate selecting a terminal by selecting one of its frames ;-( (with-selected-frame (car (frames-on-display-list terminal)) (if gpm-mouse-mode (gpm-mouse-enable) (gpm-mouse-disable)))))) (provide 't-mouse) ;; arch-tag: a63163b3-bfbe-4eb2-ab4f-201cd164b05d ;;; t-mouse.el ends here