diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:29:06 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:29:06 -0700 |
commit | e6fd84d2d5ca256797ff210c915a2fa773d4d742 (patch) | |
tree | ba2ba64a65705a3259a0ecb66098f834e741fb4b /lisp/files.el | |
parent | d86bcedd880b3cb6383641082d406075aa6e70e2 (diff) | |
parent | ab0a60a1b334fafc7d805eb44e6069ea314ad486 (diff) | |
download | emacs-e6fd84d2d5ca256797ff210c915a2fa773d4d742.tar.gz |
Merge from origin/emacs-25
ab0a60a ; * CONTRIBUTE (Generating ChangeLog entries): Drop duplicate...
7e02a47 Index byte-compile-debug
7c1e598 Document `byte-compile-debug' in the ELisp manual
4d81eb4 Document variable `byte-compile-debug'
72ef710 Fix call to debugger on assertion failure
ae8264c Call modification hooks in org-src fontify buffers
b3139da ; Fix last change in doc/lispref/strings.texi
c331f39 Improve documentation of 'format' conversions
9f52f67 Remove stale functions from ert manual
c416b14 Fix a typo in Eshell manual
06695a0 ; Fix a typo in ediff-merg.el
954e9e9 Improve documentation of hooks related to saving buffers
9fcab85 Improve documentation of auto-save-visited-file-name
2236c53 fix typo in mailcap-mime-extensions
85a3e4e Fix typos in flymake.el
a1ef10e More NEWS checking for admin.el's set-version
# Conflicts:
# lisp/emacs-lisp/bytecomp.el
Diffstat (limited to 'lisp/files.el')
-rw-r--r-- | lisp/files.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index c7de4453d75..0a023a88b10 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -439,7 +439,8 @@ functions are called." (define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1") (defvar write-file-functions nil - "List of functions to be called before writing out a buffer to a file. + "List of functions to be called before saving a buffer to a file. +Only used by `save-buffer'. 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. @@ -464,6 +465,7 @@ updates before the buffer is saved, use `before-save-hook'.") 'write-contents-functions "22.1") (defvar write-contents-functions nil "List of functions to be called before writing out a buffer to a file. +Only used by `save-buffer'. If one of them returns non-nil, the file is considered already written and the rest are not called and neither are the functions in `write-file-functions'. @@ -4855,13 +4857,15 @@ the last real save, but optional arg FORCE non-nil means delete anyway." "Normal hook run just before auto-saving.") (defcustom before-save-hook nil - "Normal hook that is run before a buffer is saved to its file." + "Normal hook that is run before a buffer is saved to its file. +Only used by `save-buffer'." :options '(copyright-update time-stamp) :type 'hook :group 'files) (defcustom after-save-hook nil - "Normal hook that is run after a buffer is saved to its file." + "Normal hook that is run after a buffer is saved to its file. +Only used by `save-buffer'." :options '(executable-make-buffer-file-executable-if-script-p) :type 'hook :group 'files) |