Mercurial > emacs
view lisp/tabify.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 | 280c8ae2476d 376148b31b5e |
line wrap: on
line source
;;; tabify.el --- tab conversion commands for Emacs ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; 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: ;; Commands to optimize spaces to tabs or expand tabs to spaces in a region ;; (`tabify' and `untabify'). The variable tab-width does the obvious. ;;; Code: ;;;###autoload (defun untabify (start end) "Convert all tabs in region to multiple spaces, preserving columns. Called non-interactively, the region is specified by arguments START and END, rather than by the position of point and mark. The variable `tab-width' controls the spacing of tab stops." (interactive "r") (save-excursion (save-restriction (narrow-to-region (point-min) end) (goto-char start) (while (search-forward "\t" nil t) ; faster than re-search (forward-char -1) (let ((tab-beg (point)) (indent-tabs-mode nil) column) (skip-chars-forward "\t") (setq column (current-column)) (delete-region tab-beg (point)) (indent-to column)))))) (defvar tabify-regexp " [ \t]+" "Regexp matching whitespace that tabify should consider. Usually this will be \" [ \\t]+\" to match a space followed by whitespace. \"^\\t* [ \\t]+\" is also useful, for tabifying only initial whitespace.") ;;;###autoload (defun tabify (start end) "Convert multiple spaces in region to tabs when possible. A group of spaces is partially replaced by tabs when this can be done without changing the column they end at. Called non-interactively, the region is specified by arguments START and END, rather than by the position of point and mark. The variable `tab-width' controls the spacing of tab stops." (interactive "r") (save-excursion (save-restriction ;; Include the beginning of the line in the narrowing ;; since otherwise it will throw off current-column. (goto-char start) (beginning-of-line) (narrow-to-region (point) end) (goto-char start) (let ((indent-tabs-mode t)) (while (re-search-forward tabify-regexp nil t) ;; The region between (match-beginning 0) and (match-end 0) is just ;; spacing which we want to adjust to use TABs where possible. (let ((end-col (current-column)) (beg-col (save-excursion (goto-char (match-beginning 0)) (skip-chars-forward "\t") (current-column)))) (if (= (/ end-col tab-width) (/ beg-col tab-width)) ;; The spacing (after some leading TABs which we wouldn't ;; want to touch anyway) does not straddle a TAB boundary, ;; so it neither contains a TAB, nor will we be able to use ;; a TAB here anyway: there's nothing to do. nil (delete-region (match-beginning 0) (point)) (indent-to end-col)))))))) (provide 'tabify) ;; arch-tag: c83893b1-e0cc-4e57-8a09-73fd03466416 ;;; tabify.el ends here