Mercurial > emacs
comparison src/xdisp.c @ 90988:492971a3f31f unicode-xft-base
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 816-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 24 Jul 2007 01:23:55 +0000 |
parents | 988f1edc9674 83bb644ccd17 |
children | f55f9811f5d7 |
comparison
equal
deleted
inserted
replaced
90987:b2d8a283f27e | 90988:492971a3f31f |
---|---|
18142 #ifdef subprocesses | 18142 #ifdef subprocesses |
18143 obj = Fsymbol_name (Fprocess_status (obj)); | 18143 obj = Fsymbol_name (Fprocess_status (obj)); |
18144 #endif | 18144 #endif |
18145 break; | 18145 break; |
18146 | 18146 |
18147 case 'R': | |
18148 { | |
18149 Lisp_Object val; | |
18150 val = call1 (intern ("file-remote-p"), current_buffer->directory); | |
18151 if (NILP (val)) | |
18152 return "-"; | |
18153 else | |
18154 return "@"; | |
18155 } | |
18156 | |
18147 case 't': /* indicate TEXT or BINARY */ | 18157 case 't': /* indicate TEXT or BINARY */ |
18148 #ifdef MODE_LINE_BINARY_TEXT | 18158 #ifdef MODE_LINE_BINARY_TEXT |
18149 return MODE_LINE_BINARY_TEXT (b); | 18159 return MODE_LINE_BINARY_TEXT (b); |
18150 #else | 18160 #else |
18151 return "T"; | 18161 return "T"; |