Mercurial > emacs
view lisp/tabify.el @ 92109:4d9fc08769fa
Consolidate the image_cache to the terminal struct.
* termhooks.h (P_): Remove redundant def.
(struct terminal): New field `image_cache'.
* frame.h (FRAME_IMAGE_CACHE): New macro. Use it everywhere in place
of FRAME_X_IMAGE_CACHE.
* xterm.h (struct x_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* w32term.h (struct w32_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* macterm.h (struct mac_display_info): Remove image_cache field.
(FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead.
* xterm.c (x_term_init):
* w32term.c (w32_term_init):
* macterm.c (mac_term_init): Set the image_cache in the terminal.
* dispextern.h (clear_image_cache, forall_images_in_image_cache):
Remove declarations.
(clear_image_caches, mark_image_cache): New declarations.
* xfaces.c (clear_face_cache):
* xdisp.c (redisplay_internal): Use clear_image_caches.
* image.c (clear_image_cache): Don't check that a frame is on
a window-system before checking if it shares the same cache.
(clear_image_caches): New function.
(Fclear_image_cache): Use it.
(mark_image): Move from allo.c.
(mark_image_cache): Move from alloc.c and forall_images_in_image_cache.
* alloc.c (mark_image, mark_image_cache): Move to image.c.
(mark_object): Don't call mark_image_cache for frames.
(mark_terminals): Call mark_image_cache.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 22 Feb 2008 17:42:09 +0000 |
parents | 73661ddc7ac7 |
children | 606f2d163a64 ee5932bf781d |
line wrap: on
line source
;;; tabify.el --- tab conversion commands for Emacs ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 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, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; 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