comparison lisp/files.el @ 1346:01c57eb70ae9

[xemacs-hg @ 2003-03-09 02:27:27 by ben] To: xemacs-patches@xemacs.org i.c: Sleep between calls to check for I/O, since these calls are non-blocking. behavior.el: Allow other keywords for forward compatibility. cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used without `finally'. cmdloop.el: Avoid truncated error messages for `end-of-file' and the like. cmdloop.el: Avoid char-int error after syncing. files.el: Eliminate byte-compile warnings. printer.el: Fix line-width calculations. #### This used to work. Someone's changes (perhaps by Michael Sperber?) seem to have messed something up. simple.el: Use new clear-left-side functions to avoid messages ending up on the same line as other output. xemacs.mak: Add override for info/ as well when separate source/build dirs. xemacs.mak: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. Makefile.in.in: Order sections in main build process and add comments. Add additional dependencies to try and prevent later steps from happening when failures in earlier steps have occurred. alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it messes up separate build/source dirs. console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions. print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr output from separate sources on separate lines. Generalize the different kinds of debugging output. Add dpa(). profile.c: Add better docs on Unix/Windows differences. regex.c: Fix problems with rel-alloc compilation caused by previous patch. emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap aborts properly. console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames, since its usage is frame-specific. Delete menubar-msw.h, gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data GCPRO'ing and add missing GCPRO recomputation in widget code.
author ben
date Sun, 09 Mar 2003 02:27:46 +0000
parents 5f6cef39d81f
children 5d5a604cb3ed
comparison
equal deleted inserted replaced
1345:3b27da507d56 1346:01c57eb70ae9
1236 (let* ((buf (get-file-buffer filename)) 1236 (let* ((buf (get-file-buffer filename))
1237 (truename (abbreviate-file-name (file-truename filename))) 1237 (truename (abbreviate-file-name (file-truename filename)))
1238 (number (nthcdr 10 (file-attributes truename))) 1238 (number (nthcdr 10 (file-attributes truename)))
1239 ; ;; Find any buffer for a file which has same truename. 1239 ; ;; Find any buffer for a file which has same truename.
1240 ; (other (and (not buf) (find-buffer-visiting filename))) 1240 ; (other (and (not buf) (find-buffer-visiting filename)))
1241 (error nil)) 1241 )
1242 1242
1243 ; ;; Let user know if there is a buffer with the same truename. 1243 ; ;; Let user know if there is a buffer with the same truename.
1244 ; (if other 1244 ; (if other
1245 ; (progn 1245 ; (progn
1246 ; (or nowarn 1246 ; (or nowarn
3552 ;; XEmacs change: use insert-directory instead of 3552 ;; XEmacs change: use insert-directory instead of
3553 ;; calling ls directly. Add option for diff. 3553 ;; calling ls directly. Add option for diff.
3554 (with-output-to-temp-buffer "*Directory*" 3554 (with-output-to-temp-buffer "*Directory*"
3555 (buffer-disable-undo standard-output) 3555 (buffer-disable-undo standard-output)
3556 (save-excursion 3556 (save-excursion
3557 (let ((switches dired-listing-switches)) 3557 (let ((switches
3558 (declare-boundp dired-listing-switches)))
3558 (if (file-symlink-p file) 3559 (if (file-symlink-p file)
3559 (setq switches (concat switches "L"))) 3560 (setq switches (concat switches "L")))
3560 (set-buffer standard-output) 3561 (set-buffer standard-output)
3561 ;; XEmacs had the following line, not in FSF. 3562 ;; XEmacs had the following line, not in FSF.
3562 (setq default-directory (file-name-directory file)) 3563 (setq default-directory (file-name-directory file))
3632 (append 3633 (append
3633 recover-file-diff-arguments 3634 recover-file-diff-arguments
3634 (list temp file-name))) 3635 (list temp file-name)))
3635 (io-error 3636 (io-error
3636 (save-excursion 3637 (save-excursion
3637 (let ((switches dired-listing-switches)) 3638 (let ((switches
3639 (declare-boundp
3640 dired-listing-switches)))
3638 (if (file-symlink-p file) 3641 (if (file-symlink-p file)
3639 (setq switches (concat switches "L"))) 3642 (setq switches (concat switches "L")))
3640 (set-buffer standard-output) 3643 (set-buffer standard-output)
3641 ;; XEmacs had the following line, not in FSF. 3644 ;; XEmacs had the following line, not in FSF.
3642 (setq default-directory (file-name-directory file)) 3645 (setq default-directory (file-name-directory file))
3643 ;; Use insert-directory-safely, not insert-directory, 3646 ;; Use insert-directory-safely,
3644 ;; because these files might not exist. In particular, 3647 ;; not insert-directory, because
3645 ;; FILE might not exist if the auto-save file was for 3648 ;; these files might not exist.
3646 ;; a buffer that didn't visit a file, such as "*mail*". 3649 ;; In particular, FILE might not
3647 ;; The code in v20.x called `ls' directly, so we need 3650 ;; exist if the auto-save file
3648 ;; to emulate what `ls' did in that case. 3651 ;; was for a buffer that didn't
3652 ;; visit a file, such as
3653 ;; "*mail*". The code in v20.x
3654 ;; called `ls' directly, so we
3655 ;; need to emulate what `ls' did
3656 ;; in that case.
3649 (insert-directory-safely file switches) 3657 (insert-directory-safely file switches)
3650 (insert-directory-safely file-name switches)) 3658 (insert-directory-safely file-name switches))
3651 (terpri) 3659 (terpri)
3652 (princ "Error during diff: ") 3660 (princ "Error during diff: ")
3653 (display-error ferr 3661 (display-error ferr
3753 This command is used in the special Dired buffer created by 3761 This command is used in the special Dired buffer created by
3754 \\[recover-session]." 3762 \\[recover-session]."
3755 (interactive) 3763 (interactive)
3756 ;; Get the name of the session file to recover from. 3764 ;; Get the name of the session file to recover from.
3757 (let ((file (declare-fboundp (dired-get-filename)))) 3765 (let ((file (declare-fboundp (dired-get-filename))))
3758 (dired-unmark 1) 3766 (declare-fboundp (dired-unmark 1))
3759 ;; #### dired-do-flagged-delete in FSF. 3767 ;; #### dired-do-flagged-delete in FSF.
3760 ;; This version is for ange-ftp 3768 ;; This version is for ange-ftp
3761 ;;(dired-do-deletions t) 3769 ;;(declare-fboundp (dired-do-deletions t))
3762 ;; This version is for efs 3770 ;; This version is for efs
3763 (declare-fboundp (dired-expunge-deletions)) 3771 (declare-fboundp (dired-expunge-deletions))
3764 (let ((files (Recover-session-files-from-auto-save-list-file file))) 3772 (let ((files (Recover-session-files-from-auto-save-list-file file)))
3765 ;; The file contains a pair of line for each auto-saved buffer. 3773 ;; The file contains a pair of line for each auto-saved buffer.
3766 ;; The first line of the pair contains the visited file name 3774 ;; The first line of the pair contains the visited file name