comparison lisp/auto-save.el @ 793:e38acbeb1cae

[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 79940b592197
children cd167465bf69 91b3aa59f49b
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 ;;; auto-save.el -- Safer autosaving for EFS and tmp. 1 ;;; auto-save.el -- Safer autosaving for EFS and tmp.
2 2
3 ;; Copyright (C) 1997 Free Software Foundation, Inc. 3 ;; Copyright (C) 1997 Free Software Foundation, Inc.
4 ;; Copyright (C) 1992 by Sebastian Kremer <sk@thp.uni-koeln.de> 4 ;; Copyright (C) 1992 by Sebastian Kremer <sk@thp.uni-koeln.de>
5 ;; Copyright (C) 2001 Ben Wing. 5 ;; Copyright (C) 2001, 2002 Ben Wing.
6 6
7 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> 7 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
8 ;; Maintainer: XEmacs Development Team 8 ;; Maintainer: XEmacs Development Team
9 ;; Keywords: extensions, dumped 9 ;; Keywords: extensions, dumped
10 ;; Version: 1.26 10 ;; Version: 1.26
11 11
12 ;; XEmacs is free software; you can redistribute it and/or modify it 12 ;; XEmacs is free software; you can redistribute it and/or modify it
13 ;; under the terms of the GNU General Public License as published by 13 ;; under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation; either version 1, or (at your option) 14 ;; the Free Software Foundation; either version 2, or (at your option)
15 ;; any later version. 15 ;; any later version.
16 16
17 ;; XEmacs is distributed in the hope that it will be useful, but 17 ;; XEmacs is distributed in the hope that it will be useful, but
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
252 252
253 (setq file-name (or file-name 253 (setq file-name (or file-name
254 buffer-file-truename 254 buffer-file-truename
255 (and buffer-file-name 255 (and buffer-file-name
256 (expand-file-name buffer-file-name)))) 256 (expand-file-name buffer-file-name))))
257 (condition-case error-data 257 (with-trapping-errors
258 (let ( 258 :operation 'make-auto-save-file-name
259 ;; So autosavename looks like #%...#, roughly as with the 259 :error-form
260 ;; old make-auto-save-file-name function. The 260 (let ((fname
261 ;; make-temp-name inserts the pid of this Emacs: this 261 (if file-name
262 ;; avoids autosaving from two Emacses into the same file. 262 (concat (file-name-directory file-name)
263 ;; It cannot be recovered automatically then because in 263 "#"
264 ;; the next Emacs session (the one after the crash) the 264 (file-name-nondirectory file-name)
265 ;; pid will be different, but file-less buffers like 265 "#")
266 ;; *mail* must be recovered manually anyway. 266 (expand-file-name
267 267 (concat "#%" (auto-save-escape-name (buffer-name))
268 ;; jwz: putting the emacs PID in the auto-save file name is bad 268 "#")))))
269 ;; news, because that defeats auto-save-recovery of *mail* 269 (if (or (file-writable-p fname)
270 ;; buffers -- the (sensible) code in sendmail.el calls 270 (file-exists-p fname))
271 ;; (make-auto-save-file-name) to determine whether there is 271 fname
272 ;; unsent, auto-saved mail to recover. If that mail came from a 272 (expand-file-name (concat "~/"
273 ;; previous emacs process (far and away the most likely case) 273 (file-name-nondirectory fname)))))
274 ;; then this can never succeed as the pid differs. 274 (let (
275 ;;(name-prefix (if file-name nil (make-temp-name "#%"))) 275 ;; So autosavename looks like #%...#, roughly as with the
276 (name-prefix (if file-name nil "#%")) 276 ;; old make-auto-save-file-name function. The
277 277 ;; make-temp-name inserts the pid of this Emacs: this
278 (save-name (or file-name 278 ;; avoids autosaving from two Emacses into the same file.
279 ;; Prevent autosave errors. Buffername 279 ;; It cannot be recovered automatically then because in
280 ;; (to become non-dir part of filename) will 280 ;; the next Emacs session (the one after the crash) the
281 ;; be escaped twice. Don't care. 281 ;; pid will be different, but file-less buffers like
282 (auto-save-escape-name (buffer-name)))) 282 ;; *mail* must be recovered manually anyway.
283 (remote-p (and-fboundp 'efs-ftp-path 283
284 (stringp file-name) 284 ;; jwz: putting the emacs PID in the auto-save file name is bad
285 (efs-ftp-path file-name)))) 285 ;; news, because that defeats auto-save-recovery of *mail*
286 ;; Return the appropriate auto save file name: 286 ;; buffers -- the (sensible) code in sendmail.el calls
287 (expand-file-name;; a buffername needs this, a filename not 287 ;; (make-auto-save-file-name) to determine whether there is
288 (cond (remote-p 288 ;; unsent, auto-saved mail to recover. If that mail came from a
289 (if efs-auto-save-remotely 289 ;; previous emacs process (far and away the most likely case)
290 (auto-save-name-in-same-directory save-name) 290 ;; then this can never succeed as the pid differs.
291 ;; We have to use the `fixed-directory' now since the 291 ;;(name-prefix (if file-name nil (make-temp-name "#%")))
292 ;; `same-directory' would be remote. 292 (name-prefix (if file-name nil "#%"))
293 ;; It will use the fallback if needed. 293
294 (auto-save-name-in-fixed-directory save-name))) 294 (save-name (or file-name
295 ;; Else it is a local file (or a buffer without a file, 295 ;; Prevent autosave errors. Buffername
296 ;; hence the name-prefix). 296 ;; (to become non-dir part of filename) will
297 ((or auto-save-directory auto-save-hash-p) 297 ;; be escaped twice. Don't care.
298 ;; Hashed files always go into the special hash dir, 298 (auto-save-escape-name (buffer-name))))
299 ;; never in the same directory, to make recognizing 299 (remote-p (and-fboundp 'efs-ftp-path
300 ;; reliable. 300 (stringp file-name)
301 (auto-save-name-in-fixed-directory save-name name-prefix)) 301 (efs-ftp-path file-name))))
302 (t 302 ;; Return the appropriate auto save file name:
303 (auto-save-name-in-same-directory save-name name-prefix))))) 303 (expand-file-name;; a buffername needs this, a filename not
304 304 (cond (remote-p
305 ;; If any error occurs in the above code, return what the old 305 (if efs-auto-save-remotely
306 ;; version of this function would have done. It is not ok to 306 (auto-save-name-in-same-directory save-name)
307 ;; return nil, e.g., when after-find-file tests 307 ;; We have to use the `fixed-directory' now since the
308 ;; file-newer-than-file-p, nil would bomb. 308 ;; `same-directory' would be remote.
309 309 ;; It will use the fallback if needed.
310 (error (warn "Error caught in `make-auto-save-file-name':\n%s" 310 (auto-save-name-in-fixed-directory save-name)))
311 (error-message-string error-data)) 311 ;; Else it is a local file (or a buffer without a file,
312 (let ((fname 312 ;; hence the name-prefix).
313 (if file-name 313 ((or auto-save-directory auto-save-hash-p)
314 (concat (file-name-directory file-name) 314 ;; Hashed files always go into the special hash dir,
315 "#" 315 ;; never in the same directory, to make recognizing
316 (file-name-nondirectory file-name) 316 ;; reliable.
317 "#") 317 (auto-save-name-in-fixed-directory save-name name-prefix))
318 (expand-file-name 318 (t
319 (concat "#%" (auto-save-escape-name (buffer-name)) 319 (auto-save-name-in-same-directory save-name name-prefix)))))))
320 "#")))))
321 (if (or (file-writable-p fname)
322 (file-exists-p fname))
323 fname
324 (expand-file-name (concat "~/"
325 (file-name-nondirectory fname))))))))
326 320
327 (defun auto-save-file-name-p (filename) 321 (defun auto-save-file-name-p (filename)
328 "Return non-nil if FILENAME can be yielded by `make-auto-save-file-name'. 322 "Return non-nil if FILENAME can be yielded by `make-auto-save-file-name'.
329 FILENAME should lack slashes. 323 FILENAME should lack slashes.
330 You can redefine this for customization." 324 You can redefine this for customization."
568 (while savefiles 562 (while savefiles
569 (setq afile (car savefiles) 563 (setq afile (car savefiles)
570 file (auto-save-original-name afile) 564 file (auto-save-original-name afile)
571 savefiles (cdr savefiles)) 565 savefiles (cdr savefiles))
572 (cond ((and file (not (file-newer-than-file-p afile file))) 566 (cond ((and file (not (file-newer-than-file-p afile file)))
573 (warn "Autosave file \"%s\" is not current." afile)) 567 (warn "Autosave file \"%s\" is not current" afile))
574 (t 568 (t
575 (incf total) 569 (incf total)
576 (with-output-to-temp-buffer "*Directory*" 570 (with-output-to-temp-buffer "*Directory*"
577 (buffer-disable-undo standard-output) 571 (buffer-disable-undo standard-output)
578 (save-excursion 572 (save-excursion