Mercurial > emacs
annotate src/disptab.h @ 110321:4b26adbef9a2
Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el.
* Makefile.in (TRAMP_SRC): Remove tramp-fish.el. Add tramp-sh.el.
* net/tramp.el (top): Don't show loading message. Require just
'tramp-compat, everything else is required there. Use
`ignore-errors' where appropriate.
(tramp-inline-compress-start-size, tramp-copy-size-limit)
(tramp-terminal-type, tramp-end-of-output)
(tramp-initial-end-of-output, tramp-completion-function-alist-rsh)
(tramp-completion-function-alist-ssh)
(tramp-completion-function-alist-telnet)
(tramp-completion-function-alist-su)
(tramp-completion-function-alist-putty, tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args)
(tramp-actions-before-shell, tramp-uudecode)
(tramp-perl-file-truename, tramp-perl-file-name-all-completions)
(tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes)
(tramp-perl-encode-with-module, tramp-perl-decode-with-module)
(tramp-perl-encode, tramp-perl-decode)
(tramp-vc-registered-read-file-names, tramp-file-mode-type-map)
(tramp-file-name-handler-alist, tramp-make-tramp-temp-file)
(tramp-handle-make-symbolic-link, tramp-handle-load)
(tramp-handle-file-name-as-directory)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-handle-file-truename)
(tramp-handle-file-exists-p, tramp-handle-file-attributes)
(tramp-do-file-attributes-with-ls)
(tramp-do-file-attributes-with-perl)
(tramp-do-file-attributes-with-stat)
(tramp-handle-set-visited-file-modtime)
(tramp-handle-verify-visited-file-modtime)
(tramp-handle-set-file-modes, tramp-handle-set-file-times)
(tramp-set-file-uid-gid, tramp-remote-selinux-p)
(tramp-handle-file-selinux-context)
(tramp-handle-set-file-selinux-context)
(tramp-handle-file-executable-p, tramp-handle-file-readable-p)
(tramp-handle-file-newer-than-file-p, tramp-handle-file-modes)
(tramp-handle-file-directory-p, tramp-handle-file-regular-p)
(tramp-handle-file-symlink-p, tramp-handle-file-writable-p)
(tramp-handle-file-ownership-preserved-p)
(tramp-handle-directory-file-name, tramp-handle-directory-files)
(tramp-handle-directory-files-and-attributes)
(tramp-do-directory-files-and-attributes-with-perl)
(tramp-do-directory-files-and-attributes-with-stat)
(tramp-handle-file-name-all-completions)
(tramp-handle-file-name-completion, tramp-handle-add-name-to-file)
(tramp-handle-copy-file, tramp-handle-copy-directory)
(tramp-handle-rename-file, tramp-do-copy-or-rename-file)
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-do-copy-or-rename-file-directly)
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-handle-make-directory, tramp-handle-delete-directory)
(tramp-handle-delete-file)
(tramp-handle-dired-recursive-delete-directory)
(tramp-handle-dired-compress-file, tramp-handle-dired-uncache)
(tramp-handle-insert-directory)
(tramp-handle-unhandled-file-name-directory)
(tramp-handle-expand-file-name)
(tramp-handle-substitute-in-file-name)
(tramp-handle-executable-find, tramp-process-sentinel)
(tramp-handle-start-file-process, tramp-handle-process-file)
(tramp-handle-call-process-region, tramp-handle-shell-command)
(tramp-handle-file-local-copy, tramp-handle-file-remote-p)
(tramp-handle-insert-file-contents)
(tramp-handle-insert-file-contents-literally)
(tramp-handle-find-backup-file-name)
(tramp-handle-make-auto-save-file-name, tramp-handle-write-region)
(tramp-vc-registered-file-names, tramp-handle-vc-registered)
(tramp-sh-file-name-handler, tramp-vc-file-name-handler)
(tramp-maybe-send-script, tramp-set-auto-save, tramp-run-test)
(tramp-run-test2, tramp-find-executable, tramp-set-remote-path)
(tramp-find-file-exists-command, tramp-open-shell)
(tramp-find-shell, tramp-barf-if-no-shell-prompt)
(tramp-open-connection-setup-interactive-shell)
(tramp-local-coding-commands, tramp-remote-coding-commands)
(tramp-find-inline-encoding, tramp-call-local-coding-command)
(tramp-inline-compress-commands, tramp-find-inline-compress)
(tramp-compute-multi-hops, tramp-maybe-open-connection)
(tramp-send-command , tramp-wait-for-output)
(tramp-send-command-and-check, tramp-barf-unless-okay)
(tramp-send-command-and-read, tramp-mode-string-to-int)
(tramp-convert-file-attributes, tramp-check-cached-permissions)
(tramp-file-mode-from-int, tramp-file-mode-permissions)
(tramp-shell-case-fold, tramp-make-copy-program-file-name)
(tramp-method-out-of-band-p, tramp-local-host-p)
(tramp-get-remote-path, tramp-get-remote-tmpdir)
(tramp-get-ls-command, tramp-get-ls-command-with-dired)
(tramp-get-test-command, tramp-get-test-nt-command)
(tramp-get-file-exists-command, tramp-get-remote-ln)
(tramp-get-remote-perl, tramp-get-remote-stat)
(tramp-get-remote-readlink, tramp-get-remote-trash)
(tramp-get-remote-id, tramp-get-remote-uid, tramp-get-remote-gid)
(tramp-get-local-uid, tramp-get-local-gid)
(tramp-get-inline-compress, tramp-get-inline-coding, ): Move to
tramp-sh.el.
(tramp-methods, tramp-default-method-alist)
(tramp-default-user-alist, tramp-foreign-file-name-handler-alist):
Move initialization to tramp-sh.el.
(tramp-temp-name-prefix): Make it a defconst.
(tramp-dissect-file-name): Don't check anymore for multi-hop
methods.
(tramp-debug-outline-regexp): Add a docstring.
(tramp-debug-outline-level): Renamed from `tramp-outline-level'.
(tramp-get-debug-buffer): Use it.
* net/tramp-cache.el (top): Set tramp-autoload cookie for
initialization forms.
(tramp-set-connection-property): Don't protect `tramp-message'
call, it isn't necessary any longer.
(tramp-dump-connection-properties): Use `ignore-errors'.
* net/tramp-compat.el (top): Require 'advice, 'format-spec,
'password-cache and 'auth-source.
* net/tramp-gvfs.el (top):
* net/tramp-smb.el (top): Require 'tramp-sh.
* net/tramp-gw.el (tramp-gw-open-network-stream): Use `ignore-errors'.
* net/tramp-sh.el: New file, derived from tramp.el.
(top): Initialize `tramp-methods', `tramp-default-method-alist',
`tramp-default-user-alist', tramp-foreign-file-name-handler-alist.
Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old". Use
`ignore-errors' where appropriate.
(tramp-sh-file-name-handler-alist): Renamed from
`tramp-file-name-handler-alist'.
(tramp-send-command-and-check): Return t or nil. Remove all
`zerop' checks, where called.
(tramp-handle-set-file-modes)
(tramp-do-copy-or-rename-file-directly)
(tramp-handle-delete-directory, tramp-handle-delete-file)
(tramp-maybe-send-script, ): Use `tramp-barf-unless-okay'.
(tramp-sh-file-name-handler, tramp-send-command-and-check)
(tramp-get-remote-ln): Set tramp-autoload cookie.
* net/tramp-fish.el: Remove file.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Mon, 13 Sep 2010 17:17:01 +0200 |
parents | e16f43875a48 |
children | 417b1e4d63cd |
rev | line source |
---|---|
484 | 1 /* Things for GLYPHS and glyph tables. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
2 Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, |
106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
484 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
484 | 8 it under the terms of the GNU General Public License as published by |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
10 (at your option) any later version. |
484 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
92277
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
484 | 19 |
20 /* Access the slots of a display-table, according to their purpose. */ | |
21 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
22 #define DISP_TABLE_P(obj) \ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
23 (CHAR_TABLE_P (obj) \ |
17363
0fe9203c7a06
(DISP_TABLE_P): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17332
diff
changeset
|
24 && EQ (XCHAR_TABLE (obj)->purpose, Qdisplay_table) \ |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
25 && CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (obj)) == DISP_TABLE_EXTRA_SLOTS) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
26 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
27 #define DISP_TABLE_EXTRA_SLOTS 6 |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
28 #define DISP_TRUNC_GLYPH(dp) ((dp)->extras[0]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
29 #define DISP_CONTINUE_GLYPH(dp) ((dp)->extras[1]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
30 #define DISP_ESCAPE_GLYPH(dp) ((dp)->extras[2]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
31 #define DISP_CTRL_GLYPH(dp) ((dp)->extras[3]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
32 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
33 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5]) |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
34 |
109099 | 35 extern Lisp_Object disp_char_vector (struct Lisp_Char_Table *, int); |
17332
35269345d9ef
(disp_char_vector): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
17183
diff
changeset
|
36 |
88370
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
37 #define DISP_CHAR_VECTOR(dp, c) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
38 (ASCII_CHAR_P(c) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
39 ? (NILP ((dp)->ascii) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
40 ? (dp)->defalt \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
41 : (SUB_CHAR_TABLE_P ((dp)->ascii) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
42 ? XSUB_CHAR_TABLE ((dp)->ascii)->contents[c] \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
43 : (dp)->ascii)) \ |
533b26683ad8
(DISP_CHAR_VECTOR): Adjusted for the change of char
Kenichi Handa <handa@m17n.org>
parents:
20309
diff
changeset
|
44 : disp_char_vector ((dp), (c))) |
484 | 45 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
46 /* Defined in window.c. */ |
109099 | 47 extern struct Lisp_Char_Table *window_display_table (struct window *); |
484 | 48 |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
49 /* Defined in indent.c. */ |
109099 | 50 extern struct Lisp_Char_Table *buffer_display_table (void); |
9406
a549857b7a13
* disptab.h (window_display_table): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
9143
diff
changeset
|
51 |
484 | 52 /* Display table to use for vectors that don't specify their own. */ |
53 extern Lisp_Object Vstandard_display_table; | |
54 | |
13183
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
55 /* This is the `purpose' slot of a display table. */ |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
56 extern Lisp_Object Qdisplay_table; |
6b79b1d9cddd
(DISP_TABLE_P): Check the `purpose' slot.
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
57 |
484 | 58 /* Vector of GLYPH definitions. Indexed by GLYPH number, |
59 the contents are a string which is how to output the GLYPH. */ | |
60 extern Lisp_Object Vglyph_table; | |
61 | |
62 /* Return the current length of the GLYPH table, | |
63 or 0 if the table isn't currently valid. */ | |
64 #define GLYPH_TABLE_LENGTH \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
65 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0) |
484 | 66 |
67 /* Return the current base (for indexing) of the GLYPH table, | |
68 or 0 if the table isn't currently valid. */ | |
69 #define GLYPH_TABLE_BASE \ | |
9143
069f8b6cdfe6
(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use
Karl Heuer <kwzh@gnu.org>
parents:
8919
diff
changeset
|
70 ((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0) |
484 | 71 |
72 /* Given BASE and LEN returned by the two previous macros, | |
73 return nonzero if the GLYPH code G should be output as a single | |
74 character with code G. Return zero if G has a string in the table. */ | |
92277 | 75 #define GLYPH_SIMPLE_P(base,len,g) \ |
76 (GLYPH_FACE (g) != DEFAULT_FACE_ID || GLYPH_CHAR (g) >= (len) || !STRINGP (base[GLYPH_CHAR (g)])) | |
484 | 77 |
78 /* Given BASE and LEN returned by the two previous macros, | |
79 return nonzero if GLYPH code G is aliased to a different code. */ | |
92277 | 80 #define GLYPH_ALIAS_P(base,len,g) \ |
81 (GLYPH_FACE (g) == DEFAULT_FACE_ID && GLYPH_CHAR (g) < (len) && INTEGERP (base[GLYPH_CHAR (g)])) | |
484 | 82 |
2725
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
83 /* Follow all aliases for G in the glyph table given by (BASE, |
507115aff66d
* xdisp.c (display_text_line): Apply faces to characters according
Jim Blandy <jimb@redhat.com>
parents:
2012
diff
changeset
|
84 LENGTH), and set G to the final glyph. */ |
92277 | 85 #define GLYPH_FOLLOW_ALIASES(base, length, g) \ |
86 do { \ | |
87 while (GLYPH_ALIAS_P ((base), (length), (g))) \ | |
88 SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \ | |
89 if (!GLYPH_CHAR_VALID_P (g)) \ | |
90 SET_GLYPH_CHAR (g, ' '); \ | |
17183
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
91 } while (0) |
00252a78ce4f
(GLYPH_FOLLOW_ALIASES): Assure that the resulting G
Kenichi Handa <handa@m17n.org>
parents:
17116
diff
changeset
|
92 |
484 | 93 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0, |
94 return the length and the address of the character-sequence | |
95 used for outputting GLYPH G. */ | |
92277 | 96 #define GLYPH_LENGTH(base,g) SCHARS (base[GLYPH_CHAR (g)]) |
97 #define GLYPH_STRING(base,g) SDATA (base[GLYPH_CHAR (g)]) | |
484 | 98 |
99 /* GLYPH for a space character. */ | |
100 | |
101 #define SPACEGLYPH 040 | |
102 #define NULL_GLYPH 00 | |
103 | |
92277 | 104 #define SET_GLYPH_FROM_CHAR(glyph, c) \ |
105 SET_GLYPH (glyph, c, DEFAULT_FACE_ID) | |
52401 | 106 |
107 /* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349 | |
108 (do not change this comment) */ |