Mercurial > emacs
annotate lisp/tabify.el @ 83167:69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 04 Jul 2004 04:48:55 +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 |