Mercurial > emacs
comparison src/filelock.c @ 10752:e4fb5e01090a
(unlock_buffer, unlock_all_files, Flock_buffer)
(Funlock_buffer): Use buffer's file_truename, not filename.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 14 Feb 1995 16:33:49 +0000 |
parents | 2ae69efc3e8b |
children | 10197e4b3fb2 |
comparison
equal
deleted
inserted
replaced
10751:dea8f022819d | 10752:e4fb5e01090a |
---|---|
379 register struct buffer *b; | 379 register struct buffer *b; |
380 | 380 |
381 for (tail = Vbuffer_alist; GC_CONSP (tail); tail = XCONS (tail)->cdr) | 381 for (tail = Vbuffer_alist; GC_CONSP (tail); tail = XCONS (tail)->cdr) |
382 { | 382 { |
383 b = XBUFFER (XCONS (XCONS (tail)->car)->cdr); | 383 b = XBUFFER (XCONS (XCONS (tail)->car)->cdr); |
384 if (STRINGP (b->filename) && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)) | 384 if (STRINGP (b->file_truename) && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)) |
385 unlock_file (b->filename); | 385 unlock_file (b->file_truename); |
386 } | 386 } |
387 } | 387 } |
388 | 388 |
389 | 389 |
390 DEFUN ("lock-buffer", Flock_buffer, Slock_buffer, | 390 DEFUN ("lock-buffer", Flock_buffer, Slock_buffer, |
394 or else nothing is done if current buffer isn't visiting a file.") | 394 or else nothing is done if current buffer isn't visiting a file.") |
395 (fn) | 395 (fn) |
396 Lisp_Object fn; | 396 Lisp_Object fn; |
397 { | 397 { |
398 if (NILP (fn)) | 398 if (NILP (fn)) |
399 fn = current_buffer->filename; | 399 fn = current_buffer->file_truename; |
400 else | 400 else |
401 CHECK_STRING (fn, 0); | 401 CHECK_STRING (fn, 0); |
402 if (SAVE_MODIFF < MODIFF | 402 if (SAVE_MODIFF < MODIFF |
403 && !NILP (fn)) | 403 && !NILP (fn)) |
404 lock_file (fn); | 404 lock_file (fn); |
410 "Unlock the file visited in the current buffer,\n\ | 410 "Unlock the file visited in the current buffer,\n\ |
411 if it should normally be locked.") | 411 if it should normally be locked.") |
412 () | 412 () |
413 { | 413 { |
414 if (SAVE_MODIFF < MODIFF | 414 if (SAVE_MODIFF < MODIFF |
415 && STRINGP (current_buffer->filename)) | 415 && STRINGP (current_buffer->file_truename)) |
416 unlock_file (current_buffer->filename); | 416 unlock_file (current_buffer->file_truename); |
417 return Qnil; | 417 return Qnil; |
418 } | 418 } |
419 | 419 |
420 | 420 |
421 /* Unlock the file visited in buffer BUFFER. */ | 421 /* Unlock the file visited in buffer BUFFER. */ |
422 | 422 |
423 unlock_buffer (buffer) | 423 unlock_buffer (buffer) |
424 struct buffer *buffer; | 424 struct buffer *buffer; |
425 { | 425 { |
426 if (BUF_SAVE_MODIFF (buffer) < BUF_MODIFF (buffer) | 426 if (BUF_SAVE_MODIFF (buffer) < BUF_MODIFF (buffer) |
427 && STRINGP (buffer->filename)) | 427 && STRINGP (buffer->file_truename)) |
428 unlock_file (buffer->filename); | 428 unlock_file (buffer->file_truename); |
429 } | 429 } |
430 | 430 |
431 DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 0, 1, 0, | 431 DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 0, 1, 0, |
432 "Return nil if the FILENAME is not locked,\n\ | 432 "Return nil if the FILENAME is not locked,\n\ |
433 t if it is locked by you, else a string of the name of the locker.") | 433 t if it is locked by you, else a string of the name of the locker.") |