Mercurial > hg > xemacs-beta

diff lisp/files.el @ 1346:01c57eb70ae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
line wrap: on
line diff
--- a/lisp/files.el	Sat Mar 08 22:52:26 2003 +0000
+++ b/lisp/files.el	Sun Mar 09 02:27:46 2003 +0000
@@ -1238,7 +1238,7 @@
 	     (number (nthcdr 10 (file-attributes truename)))
 ;	   ;; Find any buffer for a file which has same truename.
 ;	   (other (and (not buf) (find-buffer-visiting filename)))
-	     (error nil))
+	     )
 
 ; 	;; Let user know if there is a buffer with the same truename.
 ; 	(if other
@@ -3554,7 +3554,8 @@
 		 (with-output-to-temp-buffer "*Directory*"
 		   (buffer-disable-undo standard-output)
 		   (save-excursion
-		     (let ((switches dired-listing-switches))
+		     (let ((switches
+			    (declare-boundp dired-listing-switches)))
 		       (if (file-symlink-p file)
 			   (setq switches (concat switches "L")))
 		       (set-buffer standard-output)
@@ -3634,18 +3635,25 @@
 						(list temp file-name)))
 				      (io-error
 				       (save-excursion
-					 (let ((switches dired-listing-switches))
+					 (let ((switches
+						(declare-boundp
+						 dired-listing-switches)))
 					   (if (file-symlink-p file)
 					       (setq switches (concat switches "L")))
 					   (set-buffer standard-output)
 					   ;; XEmacs had the following line, not in FSF.
 					   (setq default-directory (file-name-directory file))
-					   ;; Use insert-directory-safely, not insert-directory,
-					   ;; because these files might not exist.  In particular,
-					   ;; FILE might not exist if the auto-save file was for
-					   ;; a buffer that didn't visit a file, such as "*mail*".
-					   ;; The code in v20.x called `ls' directly, so we need
-					   ;; to emulate what `ls' did in that case.
+					   ;; Use insert-directory-safely,
+					   ;; not insert-directory, because
+					   ;; these files might not exist.
+					   ;; In particular, FILE might not
+					   ;; exist if the auto-save file
+					   ;; was for a buffer that didn't
+					   ;; visit a file, such as
+					   ;; "*mail*".  The code in v20.x
+					   ;; called `ls' directly, so we
+					   ;; need to emulate what `ls' did
+					   ;; in that case.
 					   (insert-directory-safely file switches)
 					   (insert-directory-safely file-name switches))
 					 (terpri)
@@ -3755,10 +3763,10 @@
   (interactive)
   ;; Get the name of the session file to recover from.
   (let ((file (declare-fboundp (dired-get-filename))))
-    (dired-unmark 1)
+    (declare-fboundp (dired-unmark 1))
     ;; #### dired-do-flagged-delete in FSF.
     ;; This version is for ange-ftp
-    ;;(dired-do-deletions t)
+    ;;(declare-fboundp (dired-do-deletions t))
     ;; This version is for efs
     (declare-fboundp (dired-expunge-deletions))
     (let ((files (Recover-session-files-from-auto-save-list-file file)))