Mercurial > hg > xemacs-beta

diff lisp/files.el @ 844:047d37eb70d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-05-16 13:30:23 by ben] ui fixes for things that were bothering me bytecode.c, editfns.c, lisp.h, lread.c: Fix save-restriction to use markers rather than pseudo-markers (integers representing the amount of text on either side of the region). That way, all inserts are handled correctly, not just those inside old restriction. Add buffer argument to save_restriction_save(). process.c: Clean up very dirty and kludgy code that outputs into a buffer -- use proper unwind protects, etc. font-lock.c: Do save-restriction/widen around the function -- otherwise, incorrect results will ensue when a buffer has been narrowed before a call to e.g. `buffer-syntactic-context' -- something that happens quite often. fileio.c: Look for a handler for make-temp-name. window.c, winslots.h: Try to solve this annoying problem: have two frames displaying the buffer, in different places; in one, temporarily switch away to another buffer and then back -- and you've lost your position; it's reset to the other one in the other frame. My current solution involves window-level caches of buffers and points (also a cache for window-start); when set-window-buffer is called, it looks to see if the buffer was previously visited in the window, and if so, uses the most recent point at that time. (It's a marker, so it handles changes.) #### Note: It could be argued that doing it on the frame level would be better -- e.g. if you visit a buffer temporarily through a grep, and then go back to that buffer, you presumably want the grep's position rather than some previous position provided everything was in the same frame, even though the grep was in another window in the frame. However, doing it on the frame level fails when you have two windows on the same frame. Perhaps we keep both a window and a frame cache, and use the frame cache if there are no other windows on the frame showing the buffer, else the window's cache? This is probably something to be configurable using a specifier. Suggestions please please please? window.c: Clean up a bit code that deals with the annoyance of window-point vs. point. dialog.el: Function to ask a multiple-choice question, automatically choosing a dialog box or minibuffer representation as necessary. Generalized version of yes-or-no-p, y-or-n-p. files.el: Use get-user-response to ask "yes/no/diff" question when recovering. "diff" means that a diff is displayed between the current file and the autosave. (Converts/deconverts escape-quoted as necessary. No more complaints from you, Mr. Turnbull!) One known problem: when a dialog is used, it's modal, so you can't scroll the diff. Will fix soon. lisp-mode.el: If we're filling a string, don't treat semicolon as a comment, which would give very unfriendly results. Uses `buffer-syntactic-context'. simple.el: all changes back to the beginning. (Useful if you've saved the file in the middle of the changes.) simple.el: Add option kill-word-into-kill-ring, which controls whether words deleted with kill-word, backward-kill-word, etc. are "cut" into the kill ring, or "cleared" into nothingness. (My preference is the latter, by far. I'd almost go so far as suggesting we make it the default, as you can always select a word and then cut it if you want it cut.) menubar-items.el: Add option corresponding to kill-word-into-kill-ring.
author ben
date Thu, 16 May 2002 13:30:58 +0000
parents bf645ed7cfe3
children 503b6a57cf47
line wrap: on
line diff
--- a/lisp/files.el	Wed May 15 15:27:58 2002 +0000
+++ b/lisp/files.el	Thu May 16 13:30:58 2002 +0000
@@ -2995,6 +2995,11 @@
 	newbuf
       nil)))
 
+(defvar recover-file-diff-program "diff"
+  "Absolute or relative name of the `diff' program used by `recover-file'.")
+(defvar recover-file-diff-arguments '("-c")
+  "List of arguments (switches) to pass to `diff' by `recover-file'.")
+
 (defun recover-file (file)
   "Visit file FILE, but get contents from its last auto-save file."
   ;; Actually putting the file name in the minibuffer should be used
@@ -3017,9 +3022,10 @@
 		   (not (file-newer-than-file-p file-name file))
 		 (not (file-exists-p file-name)))
 	       (error "Auto-save file %s not current" file-name))
-	      ((save-window-excursion
+	      (t
+	       (save-window-excursion
 		 ;; XEmacs change: use insert-directory instead of
-		 ;; calling ls directly.
+		 ;; calling ls directly.  Add option for diff.
 		 (with-output-to-temp-buffer "*Directory*"
 		   (buffer-disable-undo standard-output)
 		   (save-excursion
@@ -3029,14 +3035,85 @@
 				       (if (file-symlink-p file) "-lL" "-l"))
 		     (setq default-directory (file-name-directory file-name))
 		     (insert-directory file-name "-l")))
-		 (yes-or-no-p (format "Recover auto save file %s? " file-name)))
-	       (switch-to-buffer (find-file-noselect file t))
-	       (let ((buffer-read-only nil))
-		 (erase-buffer)
-		 (let ((coding-system-for-read 'escape-quoted))
-		   (insert-file-contents file-name nil)))
-	       (after-find-file nil nil t))
-	      (t (error "Recover-file cancelled.")))))))
+		 (block nil
+		   (while t
+		     (case (get-user-response
+			    nil
+			    ;; Formerly included file name.  Useless now that
+			    ;; we display an ls of the files, and potentially
+			    ;; fills up the minibuffer, esp. with autosaves
+			    ;; all in one directory.
+			    "Recover auto save file? "
+			    '(("yes" "%_Yes" yes)
+			      ("no" "%_No" no)
+			      ("diff" "%_Diff" diff)))
+		       (no (error "Recover-file cancelled."))
+		       (yes
+			(switch-to-buffer (find-file-noselect file t))
+			(let ((buffer-read-only nil))
+			  (erase-buffer)
+			  (let ((coding-system-for-read 'escape-quoted))
+			    (insert-file-contents file-name nil)))
+			(after-find-file nil nil t)
+			(return nil))
+		       (diff
+			;; rather than just diff the two files (which would
+			;; be easy), we have to deal with the fact that
+			;; they may be in different formats, since
+			;; auto-saves are always in escape-quoted.  so, we
+			;; read the file into a buffer (#### should we look
+			;; at or use a file if it's already in a buffer?
+			;; maybe we would find hints as to the encoding of
+			;; the file?), then we save the resulting buffer in
+			;; escape-quoted, do the diff (between two files
+			;; both in escape-quoted) and read in the results
+			;; using coding system escape-quoted.  That way, we
+			;; should get what's correct most of the time.
+			(let ((buffer (generate-new-buffer "*recover*"))
+			      (temp
+			       (make-temp-name
+				(concat (file-name-as-directory
+					 (temp-directory))
+					(file-name-nondirectory file) "-"))))
+			  (unwind-protect
+			      (progn
+				(save-current-buffer
+				  (set-buffer buffer)
+				  (insert-file-contents file)
+				  (let ((coding-system-for-write
+					 'escape-quoted))
+				    (write-region (point-min) (point-max)
+						  temp nil 'silent)))
+				(with-output-to-temp-buffer "*Autosave Diff*"
+				  (buffer-disable-undo standard-output)
+				  (let ((coding-system-for-read
+					 'escape-quoted))
+				    (condition-case ferr
+					(apply #'call-process
+					       recover-file-diff-program
+					       nil standard-output nil
+					       (append
+						recover-file-diff-arguments
+						(list temp file-name)))
+				      (io-error
+				       (save-excursion
+					 (set-buffer standard-output)
+					 (setq default-directory
+					       (file-name-directory file))
+					 (insert-directory
+					  file
+					  (if (file-symlink-p file) "-lL"
+					    "-l"))
+					 (setq default-directory
+					       (file-name-directory file-name))
+					 (insert-directory file-name "-l")
+					 (terpri)
+					 (princ "Error during diff: ")
+					 (display-error ferr
+							standard-output)))))))
+			    (ignore-errors (kill-buffer buffer))
+			    (ignore-file-errors
+			     (delete-file temp)))))))))))))))
 
 (defun recover-session ()
   "Recover auto save files from a previous Emacs session.