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

comparison lisp/prim/files.el @ 72:b9518feda344 r20-0b31

Import from CVS: tag r20-0b31

author	cvs
date	Mon, 13 Aug 2007 09:03:46 +0200
parents	131b0175ea99
children	54cc21c15cbb

comparison

equal deleted inserted replaced

-:bae944334fa4
+:b9518feda344
 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Free Software Foundation, 59 Temple Place - Suite 330,
+;; Software Foundation, Inc. 59 Temple Place - Suite 330, Boston, MA
-;; Boston, MA 02111-1307, USA.
+;; 02111-1307, USA.
-;;; Synched up with: FSF 19.30.
+;;; Synched up with: FSF 19.34 [Partial].
 ;;; Warning: Merging this file is tough.  Beware.
 ;;; Commentary:
 ;; Defines most of XEmacs's file- and directory-handling functions,
 ;; including basic file visiting, backup generation, link handling,
 ;; ITS-id version control, load- and write-hook handling, and the like.
 ;;; Code:
-;; Avoid compilation warnings.
+;; XEmacs: Avoid compilation warnings.
 (defvar overriding-file-coding-system)
 (defvar file-coding-system)
-;; In buffer.c
+;; XEmacs: In buffer.c
 ;(defconst delete-auto-save-files t
 ;  "*Non-nil means delete auto-save file when a buffer is saved or killed.")
+;; FSF has automount-dir-prefix.  Our directory-abbrev-alist is more general.
+;; note: tmp_mnt bogosity conversion is established in paths.el.
+(defvar directory-abbrev-alist nil
+"*Alist of abbreviations for file directories.
+A list of elements of the form (FROM . TO), each meaning to replace
+FROM with TO when it appears in a directory name.
+This replacement is done when setting up the default directory of a
+newly visited file.  *Every* FROM string should start with \\\\` or ^.
+Use this feature when you have directories which you normally refer to
+via absolute symbolic links or to eliminate automounter mount points
+from the beginning of your filenames.  Make TO the name of the link,
+and FROM the name it is linked to.")
 ;;; Turn off backup files on VMS since it has version numbers.
 (defconst make-backup-files (not (eq system-type 'vax-vms))
 "*Non-nil means make a backup of a file the first time it is saved.
 This can be done by renaming the file or by copying.
 "*Non-nil in a buffer means offer to save the buffer on exit
 even if the buffer is not visiting a file.
 Automatically local in all buffers.")
 (make-variable-buffer-local 'buffer-offer-save)
+;; FSF uses normal defconst
 (defvaralias 'find-file-visit-truename 'find-file-use-truenames)
 (defvaralias 'find-file-existing-other-name 'find-file-compare-truenames)
 (defvar buffer-file-number nil
 "The device number and file number of the file visited in the current buffer.
 This pair of numbers uniquely identifies the file.
 If the buffer is visiting a new file, the value is nil.")
 (make-variable-buffer-local 'buffer-file-number)
 (put 'buffer-file-number 'permanent-local t)
+(defvar buffer-file-numbers-unique (not (memq system-type '(windows-nt)))
+"Non-nil means that buffer-file-number uniquely identifies files.")
 (defconst file-precious-flag nil
 "*Non-nil means protect against I/O errors while saving files.
 Some modes set this non-nil in particular buffers.
 This feature works by writing the new contents into a temporary file
 "List of functions to be called before writing out a buffer to a file.
 If one of them returns non-nil, the file is considered already written
 and the rest are not called.
 These hooks are considered to pertain to the visited file.
 So this list is cleared if you change the visited file name.
-See also `write-contents-hooks' and `continue-save-buffer'.
+See also `write-contents-hooks' and `continue-save-buffer'.")
-Don't make this variable buffer-local; instead, use `local-write-file-hooks'.")
 ;;; However, in case someone does make it local...
 (put 'write-file-hooks 'permanent-local t)
 (defvar local-write-file-hooks nil
 "Just like `write-file-hooks', except intended for per-buffer use.
 The functions in this list are called before the ones in
-`write-file-hooks'.")
+`write-file-hooks'.
+This variable is meant to be used for hooks that have to do with a
+particular visited file.  Therefore, it is a permanent local, so that
+changing the major mode does not clear it.  However, calling
+`set-visited-file-name' does clear it.")
 (make-variable-buffer-local 'local-write-file-hooks)
 (put 'local-write-file-hooks 'permanent-local t)
 ;; #### think about this (added by Sun).
 These hooks are considered to pertain to the buffer's contents,
 not to the particular visited file; thus, `set-visited-file-name' does
 not clear this variable, but changing the major mode does clear it.
 See also `write-file-hooks' and `continue-save-buffer'.")
-;;  Not in FSF19
+;;  XEmacs addition
 ;;  Energize needed this to hook into save-buffer at a lower level; we need
 ;;  to provide a new output method, but don't want to have to duplicate all
 ;;  of the backup file and file modes logic.that does not occur if one uses
 ;;  a write-file-hook which returns non-nil.
 (put 'write-file-data-hooks 'permanent-local t)
 A value of t means obey `eval' variables;
 nil means ignore them; anything else means query.
 The command \\[normal-mode] always obeys local-variables lists
 and ignores this variable.")
-(defvar hack-local-variables-hook nil
-"Normal hook run after processing a file's local variables specs.
-Major modes can use this to examine user-specified local variables
-in order to initialize other data structure based on them.
-This hook runs even if there were no local variables or if their
-evaluation was suppressed.  See also `enable-local-variables' and
-`enable-local-eval'.")
 ;; Avoid losing in versions where CLASH_DETECTION is disabled.
 (or (fboundp 'lock-buffer)
 (defalias 'lock-buffer 'ignore))
 (or (fboundp 'unlock-buffer)
 "Character used to separate concatenated paths.")
 (defun parse-colon-path (cd-path)
 "Explode a colon-separated list of paths into a string list."
 (and cd-path
-(let (cd-list (cd-start 0) cd-colon)
+(let (cd-list cd-list (cd-start 0) cd-colon)
 	 (setq cd-path (concat cd-path path-separator))
 	 (while (setq cd-colon (string-match path-separator cd-path cd-start))
 	   (setq cd-list
 		 (nconc cd-list
 			(list (if (= cd-start cd-colon)
 (defun cd (dir)
 "Make DIR become the current buffer's default directory.
 If your environment includes a `CDPATH' variable, try each one of that
 colon-separated list of directories when resolving a relative directory name."
-;  (interactive "DChange default directory: ")
 (interactive
-;; XEmacs change?
+;; XEmacs change? (read-file-name => read-directory-name)
 (list (read-directory-name "Change default directory: "
 			      default-directory default-directory
 			      (and (member cd-path '(nil ("./")))
 				   (null (getenv "CDPATH"))))))
 (if (file-name-absolute-p dir)
 (cd-absolute (expand-file-name dir))
-(progn
+;; XEmacs
 (if (null cd-path)
-;;#### Unix-specific
+	;;#### Unix-specific
-(let ((trypath (parse-colon-path (getenv "CDPATH"))))
+	(let ((trypath (parse-colon-path (getenv "CDPATH"))))
-(setq cd-path (or trypath (list "./")))))
+	  (setq cd-path (or trypath (list "./")))))
 (or (catch 'found
-(mapcar #'(lambda (x)
+	  (mapcar #'(lambda (x)
-(let ((f (expand-file-name (concat x dir))))
+		        (let ((f (expand-file-name (concat x dir))))
-(if (file-directory-p f)
+			  (if (file-directory-p f)
-(progn
+			      (progn
-(cd-absolute f)
+			        (cd-absolute f)
-(throw 'found t)))))
+			        (throw 'found t)))))
-cd-path)
+		  cd-path)
-nil)
+	  nil)
-	  ;; jwz: give a better error message to those of us with the
+	;; jwz: give a better error message to those of us with the
-	  ;; good taste not to use a kludge like $CDPATH.
+	;; good taste not to use a kludge like $CDPATH.
-	  (if (equal cd-path '("./"))
+	(if (equal cd-path '("./"))
-	      (error "No such directory: %s" (expand-file-name dir))
+	    (error "No such directory: %s" (expand-file-name dir))
-	    (error "Directory not found in $CDPATH: %s" dir))))))
+	  (error "Directory not found in $CDPATH: %s" dir)))))
 (defun load-file (file)
 "Load the Lisp file named FILE."
 (interactive "fLoad file: ")
 (load (expand-file-name file) nil nil t))
-; We now dump utils/lib-complete.el which has improved versions of these.
+; We now dump utils/lib-complete.el which has improved versions of this.
 ;(defun load-library (library)
 ;  "Load the library named LIBRARY.
 ;This is an interface to the function `load'."
 ;  (interactive "sLoad library: ")
 ;  (load library))
 (let ((handler (find-file-name-handler file 'file-local-copy)))
 (if handler
 	(funcall handler 'file-local-copy file)
 nil)))
+;; XEmacs change block
 ; We have this in C and use the realpath() system call.
 ;(defun file-truename (filename &optional counter prev-dirs)
 ;  "Return the truename of FILENAME, which should be absolute.
 ;The truename of a file name is found by chasing symbolic links
 				     dir)))))
 (if (and find-file-use-truenames buffer-file-truename)
 	(setq buffer-file-name (abbreviate-file-name buffer-file-truename)
 	      default-directory (file-name-directory buffer-file-name)))
 buffer-file-truename))
+;; End XEmacs change block
 (defun file-chase-links (filename)
 "Chase links in FILENAME until a name that is not a link.
 Does not examine containing directories for links,
 unlike `file-truename'."
 (defun generate-new-buffer (name)
 "Create and return a buffer with a name based on NAME.
 Choose the buffer's name using `generate-new-buffer-name'."
 (get-buffer-create (generate-new-buffer-name name)))
-;; FSF has automount-dir-prefix.  Our directory-abbrev-alist is more general.
-;; note: tmp_mnt bogosity conversion is established in paths.el.
-(defvar directory-abbrev-alist nil
-"*Alist of abbreviations for file directories.
-A list of elements of the form (FROM . TO), each meaning to replace
-FROM with TO when it appears in a directory name.
-This replacement is done when setting up the default directory of a
-newly visited file.  *Every* FROM string should start with \\\\` or ^.
-Use this feature when you have directories which you normally refer to
-via absolute symbolic links or to eliminate automounter mount points
-from the beginning of your filenames.  Make TO the name of the link,
-and FROM the name it is linked to.")
 (defvar abbreviated-home-dir nil
 "The user's homedir abbreviated according to `directory-abbrev-alist'.")
 (defun abbreviate-file-name (filename &optional hack-homedir)
 (setq alist nil))
 (setq alist (cdr alist))))))
 (if mode
 (funcall mode))
 ))))))
+(defvar hack-local-variables-hook nil
+"Normal hook run after processing a file's local variables specs.
+Major modes can use this to examine user-specified local variables
+in order to initialize other data structure based on them.
+This hook runs even if there were no local variables or if their
+evaluation was suppressed.  See also `enable-local-variables' and
+`enable-local-eval'.")
 (defun hack-local-variables (&optional force)
 "Parse, and bind or evaluate as appropriate, any local variables
 for current buffer."
 ;; Don't look for -*- if this file name matches any
 (if (> count 0)
 	filename
 (error "Apparently circular symlink path"))))
 ;;; files.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/prim/files.el @ 72:b9518feda344 r20-0b31