From: Eric Abrahamsen <eric@ericabrahamsen.net>
To: emacs-devel@gnu.org
Subject: Re: Proposal: move write-contents-functions higher up in basic-save-buffer
Date: Thu, 25 May 2017 15:42:04 +0800 [thread overview]
Message-ID: <87wp95idrn.fsf@ericabrahamsen.net> (raw)
In-Reply-To: jwv7f16bfud.fsf-monnier+gmane.emacs.devel@gnu.org
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
Stefan Monnier <monnier@iro.umontreal.ca> writes:
> I haven't looked at basic-save-buffer recently, but in the worst case we
> could keep the current code and add a
>
> (if (null buffer-file-name)
> (run-hook-... 'write-contents-functions)
> ...)
>
> but admittedly, it's better if we can move the single call to
> write-contents-functions so it's shared by the file and the
> non-file cases.
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Eric Abrahamsen <eric@ericabrahamsen.net>
>> Date: Wed, 24 May 2017 12:55:53 +0800
>> I can try to produce a patch, if this is acceptable in principle.
>
> Yes, please.
Richard Stallman <rms@gnu.org> writes:
> Please try using write-contents-functions for this, and you'll see if it
> does the job. If not, you'll see what more change is needed.
Okay, here's a first stab at it. I think it should work correctly: all
the short-circuit hooks get a chance to run in all cases, but the
function only insists on the presence of a file if
`write-contents-functions' are not present, or if they fail with a nil
value. I'd like to specify in the docs that those functions should fail
with an error.
If this looks okay I'll spend a bit more time testing it, then make
docstring and manual edits.
Eric
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-First-whack-at-write-contents-functions-for-non-file.patch --]
[-- Type: text/x-diff, Size: 7052 bytes --]
From af4f811439785113fe2be71f499006776958755b Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Thu, 25 May 2017 15:28:19 +0800
Subject: [PATCH] First whack at write-contents-functions for non-file buffers
---
lisp/files.el | 106 +++++++++++++++++++++++++++++++---------------------------
1 file changed, 56 insertions(+), 50 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 8ac1993754..c074fa7995 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4943,29 +4943,14 @@ basic-save-buffer
(if (buffer-base-buffer)
(set-buffer (buffer-base-buffer)))
(if (or (buffer-modified-p)
- ;; handle the case when no modification has been made but
- ;; the file disappeared since visited
+ ;; Handle the case when no modification has been made but
+ ;; the file disappeared since visited.
(and buffer-file-name
(not (file-exists-p buffer-file-name))))
(let ((recent-save (recent-auto-save-p))
setmodes)
- ;; If buffer has no file name, ask user for one.
- (or buffer-file-name
- (let ((filename
- (expand-file-name
- (read-file-name "File to save in: "
- nil (expand-file-name (buffer-name))))))
- (if (file-exists-p filename)
- (if (file-directory-p filename)
- ;; Signal an error if the user specified the name of an
- ;; existing directory.
- (error "%s is a directory" filename)
- (unless (y-or-n-p (format-message
- "File `%s' exists; overwrite? "
- filename))
- (error "Canceled"))))
- (set-visited-file-name filename)))
- (or (verify-visited-file-modtime (current-buffer))
+ (or (null buffer-file-name)
+ (verify-visited-file-modtime (current-buffer))
(not (file-exists-p buffer-file-name))
(yes-or-no-p
(format
@@ -4977,6 +4962,7 @@ basic-save-buffer
(save-excursion
(and (> (point-max) (point-min))
(not find-file-literally)
+ (null buffer-read-only)
(/= (char-after (1- (point-max))) ?\n)
(not (and (eq selective-display t)
(= (char-after (1- (point-max))) ?\r)))
@@ -4989,41 +4975,60 @@ basic-save-buffer
(save-excursion
(goto-char (point-max))
(insert ?\n))))
- ;; Support VC version backups.
- (vc-before-save)
;; Don't let errors prevent saving the buffer.
(with-demoted-errors (run-hooks 'before-save-hook))
- (or (run-hook-with-args-until-success 'write-contents-functions)
- (run-hook-with-args-until-success 'local-write-file-hooks)
- (run-hook-with-args-until-success 'write-file-functions)
- ;; If a hook returned t, file is already "written".
- ;; Otherwise, write it the usual way now.
- (let ((dir (file-name-directory
- (expand-file-name buffer-file-name))))
- (unless (file-exists-p dir)
- (if (y-or-n-p
- (format-message
- "Directory `%s' does not exist; create? " dir))
- (make-directory dir t)
- (error "Canceled")))
- (setq setmodes (basic-save-buffer-1))))
+ ;; Give `write-contents-functions' a chance to
+ ;; short-circuit the whole process.
+ (unless (run-hook-with-args-until-success 'write-contents-functions)
+ ;; If buffer has no file name, ask user for one.
+ (or buffer-file-name
+ (let ((filename
+ (expand-file-name
+ (read-file-name "File to save in: "
+ nil (expand-file-name (buffer-name))))))
+ (if (file-exists-p filename)
+ (if (file-directory-p filename)
+ ;; Signal an error if the user specified the name of an
+ ;; existing directory.
+ (error "%s is a directory" filename)
+ (unless (y-or-n-p (format-message
+ "File `%s' exists; overwrite? "
+ filename))
+ (error "Canceled"))))
+ (set-visited-file-name filename)))
+ ;; Support VC version backups.
+ (vc-before-save)
+ (or (run-hook-with-args-until-success 'local-write-file-hooks)
+ (run-hook-with-args-until-success 'write-file-functions)
+ ;; If a hook returned t, file is already "written".
+ ;; Otherwise, write it the usual way now.
+ (let ((dir (file-name-directory
+ (expand-file-name buffer-file-name))))
+ (unless (file-exists-p dir)
+ (if (y-or-n-p
+ (format-message
+ "Directory `%s' does not exist; create? " dir))
+ (make-directory dir t)
+ (error "Canceled")))
+ (setq setmodes (basic-save-buffer-1)))))
;; Now we have saved the current buffer. Let's make sure
;; that buffer-file-coding-system is fixed to what
;; actually used for saving by binding it locally.
- (if save-buffer-coding-system
- (setq save-buffer-coding-system last-coding-system-used)
- (setq buffer-file-coding-system last-coding-system-used))
- (setq buffer-file-number
- (nthcdr 10 (file-attributes buffer-file-name)))
- (if setmodes
- (condition-case ()
- (progn
- (unless
- (with-demoted-errors
- (set-file-modes buffer-file-name (car setmodes)))
- (set-file-extended-attributes buffer-file-name
- (nth 1 setmodes))))
- (error nil))))
+ (when buffer-file-name
+ (if save-buffer-coding-system
+ (setq save-buffer-coding-system last-coding-system-used)
+ (setq buffer-file-coding-system last-coding-system-used))
+ (setq buffer-file-number
+ (nthcdr 10 (file-attributes buffer-file-name)))
+ (if setmodes
+ (condition-case ()
+ (progn
+ (unless
+ (with-demoted-errors
+ (set-file-modes buffer-file-name (car setmodes)))
+ (set-file-extended-attributes buffer-file-name
+ (nth 1 setmodes))))
+ (error nil)))))
;; If the auto-save file was recent before this command,
;; delete it now.
(delete-auto-save-file-if-necessary recent-save)
@@ -5255,7 +5260,8 @@ save-some-buffers
(and pred
(progn
(set-buffer buffer)
- (and buffer-offer-save (> (buffer-size) 0)))))
+ (and buffer-offer-save (> (buffer-size) 0))))
+ write-contents-functions)
(or (not (functionp pred))
(with-current-buffer buffer (funcall pred)))
(if arg
--
2.13.0
next prev parent reply other threads:[~2017-05-25 7:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 7:19 Proposal: move write-contents-functions higher up in basic-save-buffer Eric Abrahamsen
2017-05-23 7:25 ` Eric Abrahamsen
2017-05-23 18:41 ` Eli Zaretskii
2017-05-23 18:39 ` Eli Zaretskii
2017-05-23 23:09 ` Eric Abrahamsen
2017-05-24 2:38 ` Eli Zaretskii
2017-05-24 4:55 ` Eric Abrahamsen
2017-05-24 12:29 ` Stefan Monnier
2017-05-25 7:42 ` Eric Abrahamsen [this message]
2017-05-24 17:46 ` Eli Zaretskii
2017-05-24 14:12 ` Richard Stallman
2017-05-28 10:12 ` Eric Abrahamsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wp95idrn.fsf@ericabrahamsen.net \
--to=eric@ericabrahamsen.net \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).