xemacs-beta: lisp/prim/files.el comparison

comparison lisp/prim/files.el @ 151:59463afc5666 r20-3b2

Import from CVS: tag r20-3b2

author	cvs
date	Mon, 13 Aug 2007 09:37:19 +0200
parents	538048ae2ab8
children	25f70ba0133c

comparison

equal deleted inserted replaced

-:8ebb1c0f0f6f
+:59463afc5666
 On VMS, when you visit a file using a logical name that searches a path,
 you may or may not want the visited file name to record the specific
 directory where the file was found.  If you *do not* want that, add the logical
 name to this list as a string.")
-;(defun find-buffer-visiting (filename)
+;; This function is needed by FSF vc.el.  I hope somebody can make it
-;  "Return the buffer visiting file FILENAME (a string).
+;; work for XEmacs.  -sb.
-;This is like `get-file-buffer', except that it checks for any buffer
+(defun find-buffer-visiting (filename)
-;visiting the same file, possibly under a different name.
+"Return the buffer visiting file FILENAME (a string).
-;If there is no such live buffer, return nil."
+This is like `get-file-buffer', except that it checks for any buffer
-;  (let ((buf (get-file-buffer filename))
+visiting the same file, possibly under a different name.
-;	(truename (abbreviate-file-name (file-truename filename))))
+If there is no such live buffer, return nil."
-;    (or buf
+(let ((buf (get-file-buffer filename))
-;	(let ((list (buffer-list)) found)
+	(truename (abbreviate-file-name (file-truename filename))))
-;	  (while (and (not found) list)
+(or buf
-;	    (save-excursion
+	(let ((list (buffer-list)) found)
-;	      (set-buffer (car list))
+	  (while (and (not found) list)
-;	      (if (and buffer-file-name
+	    (save-excursion
-;		       (string= buffer-file-truename truename))
+	      (set-buffer (car list))
-;		  (setq found (car list))))
+	      (if (and buffer-file-name
-;	    (setq list (cdr list)))
+		       (string= buffer-file-truename truename))
-;	  found)
+		  (setq found (car list))))
-;	(let ((number (nthcdr 10 (file-attributes truename)))
+	    (setq list (cdr list)))
-;	      (list (buffer-list)) found)
+	  found)
-;	  (and number
+	(let ((number (nthcdr 10 (file-attributes truename)))
-;	       (while (and (not found) list)
+	      (list (buffer-list)) found)
-;		 (save-excursion
+	  (and buffer-file-numbers-unique
-;		   (set-buffer (car list))
+	       number
-;		   (if (and buffer-file-number
+	       (while (and (not found) list)
-;                           (equal buffer-file-number number)
+		 (save-excursion
-;			    ;; Verify this buffer's file number
+		   (set-buffer (car list))
-;			    ;; still belongs to its file.
+		   (if (and buffer-file-number
-;			    (file-exists-p buffer-file-name)
+(equal buffer-file-number number)
-;			    (equal (nthcdr 10 (file-attributes buffer-file-name))
+			    ;; Verify this buffer's file number
-;				   number))
+			    ;; still belongs to its file.
-;		       (setq found (car list))))
+			    (file-exists-p buffer-file-name)
-;		 (setq list (cdr list))))
+			    (equal (nthcdr 10 (file-attributes buffer-file-name))
-;	  found))))
+				   number))
+		       (setq found (car list))))
+		 (setq list (cdr list))))
+	  found))))
 (defun insert-file-contents-literally (filename &optional visit beg end replace)
 "Like `insert-file-contents', q.v., but only reads in the file.
 A buffer may be modified in several ways after reading into the buffer due
 to advanced Emacs features, such as file-name-handlers, format decoding,
 buf)))
 (defvar after-find-file-from-revert-buffer nil)
 (defun after-find-file (&optional error warn noauto
-				  after-find-file-from-revert-buffer)
+				  after-find-file-from-revert-buffer
+				  nomodes)
 "Called after finding a file and by the default revert function.
 Sets buffer mode, parses local variables.
 Optional args ERROR, WARN, and NOAUTO: ERROR non-nil means there was an
 error in reading the file.  WARN non-nil means warn if there
 exists an auto-save file more recent than the visited file.
 NOAUTO means don't mess with auto-save mode.
 Fourth arg AFTER-FIND-FILE-FROM-REVERT-BUFFER non-nil
 means this call was from `revert-buffer'.
+Fifth arg NOMODES non-nil means don't alter the file's modes.
 Finishes by calling the functions in `find-file-hooks'."
 (setq buffer-read-only (not (file-writable-p buffer-file-name)))
 (if noninteractive
 nil
 (let* (not-serious
 		   (gettext "File exists, but cannot be read."))
 		  ((not buffer-read-only)
 		   (if (and warn
 			    (file-newer-than-file-p (make-auto-save-file-name)
 						    buffer-file-name))
-	       (gettext "Auto save file is newer; consider M-x recover-file")
+		       (format "%s has auto save data; consider M-x recover-file"
 		     (setq not-serious t)
-		     (if error (gettext "(New file)") nil)))
+		     (if error (gettext "(New file)") nil))))
 		  ((not error)
 		   (setq not-serious t)
 		   (gettext "Note: file is write protected"))
 		  ((file-attributes (directory-file-name default-directory))
 		   (gettext "File not found and directory write-protected"))
 		   ;; If the directory the buffer is in doesn't exist,
 		   ;; offer to create it.  It's better to do this now
 		   ;; than when we save the buffer, because we want
 		   ;; autosaving to work.
 		   (setq buffer-read-only nil)
-		   (or (file-exists-p (file-name-directory buffer-file-name))
+		   (if (file-exists-p (file-name-directory (directory-file-name (file-name-directory buffer-file-name))))
-		       (if (yes-or-no-p
+		       "Use M-x make-dir RET RET to create the directory"
-			    (format
+		     "Use C-u M-x make-dir RET RET to create directory and its parents")))))
-		       "The directory containing %s does not exist.  Create? "
-			     (abbreviate-file-name buffer-file-name)))
-			   (make-directory (file-name-directory
-buffer-file-name)
-t)))
-		   nil))))
 (if msg
 	  (progn
 	    (message msg)
 	    (or not-serious (sit-for 1 t)))))
 (if (and auto-save-default (not noauto))
 	(auto-save-mode t)))
-(normal-mode t)
+(unless nomodes
-(run-hooks 'find-file-hooks))
+(normal-mode t)
+(run-hooks 'find-file-hooks)))
 (defun normal-mode (&optional find-file)
 "Choose the major mode for this buffer automatically.
 Also sets up any specified local variables of the file.
 Uses the visited file name, the -*- line, and the local variables spec.
 and `kept-new-versions', which tells how many newest versions to keep.
 Defaults are 2 old versions and 2 new.
 `dired-kept-versions' controls dired's clean-directory (.) command.
 If `delete-old-versions' is nil, system will query user
 before trimming versions.  Otherwise it does it silently."
-(interactive "p")
+(interactive "_p")
 (let ((modp (buffer-modified-p))
 	(large (> (buffer-size) 50000))
 	(make-backup-files (or (and make-backup-files (not (eq args 0)))
 			       (memq args '(16 64)))))
 (and modp (memq args '(16 64)) (setq buffer-backed-up nil))
 hook functions.
 If `revert-buffer-function' is used to override the normal revert
 mechanism, this hook is not used.")
-(defun revert-buffer (&optional ignore-auto noconfirm)
+(defun revert-buffer (&optional ignore-auto noconfirm preserve-modes)
 "Replace the buffer text with the text of the visited file on disk.
 This undoes all changes since the file was visited or saved.
 With a prefix argument, offer to revert from latest auto-save file, if
 that is more recent than the visited file.
+This command also works for special buffers that contain text which
+doesn't come from a file, but reflects some other data base instead:
+for example, Dired buffers and buffer-list buffers.  In these cases,
+it reconstructs the buffer contents from the appropriate data base.
 When called from Lisp, the first argument is IGNORE-AUTO; only offer
 to revert from the auto-save file when this is nil.  Note that the
 sense of this argument is the reverse of the prefix argument, for the
 sake of backward compatibility.  IGNORE-AUTO is optional, defaulting
 to nil.
 Optional second argument NOCONFIRM means don't ask for confirmation at
 all.
+Optional third argument PRESERVE-MODES non-nil means don't alter
+the files modes.  Normally we reinitialize them using `normal-mode'.
 If the value of `revert-buffer-function' is non-nil, it is called to
 do the work.
 The default revert function runs the hook `before-revert-hook' at the
 					 nil nil t)))
 	       (goto-char (min opoint (point-max)))
 	       ;; Recompute the truename in case changes in symlinks
 	       ;; have changed the truename.
 	       ;XEmacs: already done by insert-file-contents
-	       ;(compute-buffer-file-truename)
+	       ;;(setq buffer-file-truename
-	       (after-find-file nil nil t t)
+		     ;;(abbreviate-file-name (file-truename buffer-file-name)))
+	       (after-find-file nil nil t t preserve-modes)
 	       ;; Run after-revert-hook as it was before we reverted.
 	       (setq-default revert-buffer-internal-hook global-hook)
 	       (if local-hook-p
 		   (progn
 		     (make-local-variable 'revert-buffer-internal-hook)

Mercurial > hg > xemacs-beta

comparison lisp/prim/files.el @ 151:59463afc5666 r20-3b2