procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-26

Browse source 
3109d2b (origin/emacs-26) ; * lisp/ldefs-boot.el: Update.
86825c4 * etc/NEWS: Remove temporary markup.
737d0a2 * Update etc/AUTHORS
fbd03ba * ChangeLog.3: Update
56794ac Fix Bug#31022
a231c33 Update "Calendrical Calculations" cites
1527235 ; * doc/lispref/compile.texi (Compilation Functions): Fix wor...
b07decd ; * doc/lispref/compile.texi (Compilation Functions): Fix typo
a64c11a Fix term.el rendering following a window resize (Bug#30544)
1e6f09a * files.el (auto-save-visited-mode): Don't prompt for filenames.
eb8b13f ; * etc/NEWS: Improve the entry about pinentry.el removal.
52501ec Quote a few backticks in docstrings.

Conflicts:
	etc/NEWS
	lisp/ldefs-boot.el
This commit is contained in:
Glenn Morris 2018-04-04 07:50:45 -07:00
commit 2f779d8ce8
9 changed files with 3133 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/files.el
View file

@ -436,8 +436,9 @@ and toggle it if ARG is `toggle'."
auto-save-visited-interval :repeat
#'save-some-buffers :no-prompt
(lambda ()
(not (and buffer-auto-save-file-name
auto-save-visited-file-name)))))))
(and buffer-file-name
(not (and buffer-auto-save-file-name
auto-save-visited-file-name))))))))
;; The 'set' part is so we don't get a warning for using this variable
;; above, while still catching code that _sets_ the variable to get