comparison src/xdisp.c @ 90998:539530fa389c

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 832-838) - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Fix void function definition error in cus-edit.el - Update from CVS - Restore lisp/emacs-lisp/cl-loaddefs.el - Merge from emacs--rel--22 * emacs--rel--22 (patch 75-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
author Miles Bader <miles@gnu.org>
date Fri, 03 Aug 2007 05:20:51 +0000
parents f55f9811f5d7 9111398fdf27
children 424b655804ca
comparison
equal deleted inserted replaced
90997:12fc8f96710b 90998:539530fa389c
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': 18147 case '@':
18148 { 18148 {
18149 Lisp_Object val; 18149 Lisp_Object val;
18150 val = call1 (intern ("file-remote-p"), current_buffer->directory); 18150 val = call1 (intern ("file-remote-p"), current_buffer->directory);
18151 if (NILP (val)) 18151 if (NILP (val))
18152 return "-"; 18152 return "-";