Mercurial > emacs
annotate lisp/tabify.el @ 82988:f82e3a6f5ccb
A few more bugfixes and new features.
(Sigh.) I obviously need to remember to separate individual changes
to multiple commits.
src/emacsclient.c: Improved error handling.
(decode_options): Changed frame option (again) from -f to -t.
(print_help_and_exit): Ditto.
(copy_from_to): Check EINTR after write, not EAGAIN. Removed SIGIO hack.
(pty_conversation): Handle errors transmitted through the socket.
Handle pty errors by not reading from it anymore.
(main): Restore correct errno after socket_status failed. Send -tty
on -t, not -pty.
lisp/server.el (server-process-filter): Watch -tty, not -pty.
Use make-frame-on-tty instead of make-terminal-frame.
Don't set newframe to t if make-frame-on-tty failed.
Don't delete frames here. Print correct message when there are no
files to edit, but a new frame was requested.
(server-sentinel): Delete the frame after the process.
(server-handle-delete-frame): New function for delete-frame-functions.
(server-start): Add server-handle-delete-frame to delete-frame-functions.
(server-buffer-done): Don't delete frames here.
src/alloc.c (mark_ttys): Add prototype.
(Fgarbage_collect): Call mark_ttys.
src/emacs.c: (shut_down_emacs): Don't flush stdout before
reset_sys_modes().
src/process.c (add_keyboard_wait_descriptor_called_flag): Removed.
(add_keyboard_wait_descriptor): Removed stdin hack.
src/sysdep.c: Unconditionally include sysselect.h.
(old_fcntl_flags): Changed to an array.
(init_sigio, reset_sigio): Use it.
(narrow_foreground_group, widen_foreground_group): Use setpgid, not
setpgrp.
(old_fcntl_owner): Changed to an array.
(init_sys_modes, reset_sys_modes): Use it. Fix fsync() and reset_sigio() calls.
src/term.c (Qframe_tty_name, Qframe_tty_type): New variables.
(syms_of_term): Initialize them.
(Fframe_tty_name, Fframe_tty_type): New functions.
(term_init): Call add_keyboard_wait_descriptor().
(Fdelete_tty): New function.
(delete_tty): Call delete_keyboard_wait_descriptor().
(get_current_tty): Removed.
(mark_ttys): New function.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-28
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 31 Dec 2003 05:09:29 +0000 |
parents | 695cf19ef79e |
children | 6fb026ad601f 375f2633d815 |
rev | line source |
---|---|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
1 ;;; tabify.el --- tab conversion commands for Emacs |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
2 |
7304 | 3 ;; Copyright (C) 1985, 1994 Free Software Foundation, Inc. |
841 | 4 |
775
1ca26ccad38e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
5 ;; Maintainer: FSF |
36 | 6 |
7 ;; This file is part of GNU Emacs. | |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
775
diff
changeset
|
11 ;; the Free Software Foundation; either version 2, or (at your option) |
36 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
36 | 23 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1497
diff
changeset
|
24 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1497
diff
changeset
|
25 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1497
diff
changeset
|
26 ;; Commands to optimize spaces to tabs or expand tabs to spaces in a region |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1497
diff
changeset
|
27 ;; (`tabify' and `untabify'). The variable tab-width does the obvious. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1497
diff
changeset
|
28 |
775
1ca26ccad38e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
29 ;;; Code: |
36 | 30 |
258 | 31 ;;;###autoload |
36 | 32 (defun untabify (start end) |
33 "Convert all tabs in region to multiple spaces, preserving columns. | |
1497 | 34 Called non-interactively, the region is specified by arguments |
35 START and END, rather than by the position of point and mark. | |
36 The variable `tab-width' controls the spacing of tab stops." | |
36 | 37 (interactive "r") |
38 (save-excursion | |
39 (save-restriction | |
2467
a3bdf5ac2e9d
(untabify): Don't really change where restriction starts.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
40 (narrow-to-region (point-min) end) |
36 | 41 (goto-char start) |
42 (while (search-forward "\t" nil t) ; faster than re-search | |
18344
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
43 (forward-char -1) |
5715
a7f72ce7bac4
(tabify): Don't delete back before initial START.
Richard M. Stallman <rms@gnu.org>
parents:
5165
diff
changeset
|
44 (let ((tab-beg (point)) |
18344
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
45 (indent-tabs-mode nil) |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
46 column) |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
47 (skip-chars-forward "\t") |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
48 (setq column (current-column)) |
5715
a7f72ce7bac4
(tabify): Don't delete back before initial START.
Richard M. Stallman <rms@gnu.org>
parents:
5165
diff
changeset
|
49 (delete-region tab-beg (point)) |
36 | 50 (indent-to column)))))) |
51 | |
18344
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
52 (defvar tabify-regexp "[ \t][ \t]+" |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
53 "Regexp matching whitespace that tabify should consider. |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
54 Usually this will be \"[ \\t][ \\t]+\" to match two or more spaces or tabs. |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
55 \"^[ \\t]+\" is also useful, for tabifying only initial whitespace.") |
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
56 |
258 | 57 ;;;###autoload |
36 | 58 (defun tabify (start end) |
59 "Convert multiple spaces in region to tabs when possible. | |
60 A group of spaces is partially replaced by tabs | |
61 when this can be done without changing the column they end at. | |
1497 | 62 Called non-interactively, the region is specified by arguments |
63 START and END, rather than by the position of point and mark. | |
64 The variable `tab-width' controls the spacing of tab stops." | |
36 | 65 (interactive "r") |
66 (save-excursion | |
67 (save-restriction | |
11421
c53961dfba50
(tabify): Include entire first line in narrowing.
Richard M. Stallman <rms@gnu.org>
parents:
7304
diff
changeset
|
68 ;; Include the beginning of the line in the narrowing |
c53961dfba50
(tabify): Include entire first line in narrowing.
Richard M. Stallman <rms@gnu.org>
parents:
7304
diff
changeset
|
69 ;; since otherwise it will throw off current-column. |
c53961dfba50
(tabify): Include entire first line in narrowing.
Richard M. Stallman <rms@gnu.org>
parents:
7304
diff
changeset
|
70 (goto-char start) |
c53961dfba50
(tabify): Include entire first line in narrowing.
Richard M. Stallman <rms@gnu.org>
parents:
7304
diff
changeset
|
71 (beginning-of-line) |
c53961dfba50
(tabify): Include entire first line in narrowing.
Richard M. Stallman <rms@gnu.org>
parents:
7304
diff
changeset
|
72 (narrow-to-region (point) end) |
36 | 73 (goto-char start) |
18344
dca9b4a8155e
(untabify): Handle consecutive tabs all at once.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
74 (while (re-search-forward tabify-regexp nil t) |
36 | 75 (let ((column (current-column)) |
76 (indent-tabs-mode t)) | |
77 (delete-region (match-beginning 0) (point)) | |
78 (indent-to column)))))) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
79 |
5165 | 80 (provide 'tabify) |
81 | |
52401 | 82 ;;; arch-tag: c83893b1-e0cc-4e57-8a09-73fd03466416 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
83 ;;; tabify.el ends here |