]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Tue, 1 Dec 2020 15:50:09 +0000 (07:50 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 1 Dec 2020 15:50:09 +0000 (07:50 -0800)
9939c435c1 Return the correct suffix in eww-make-unique-file-name
17fa17be3d Save bookmarks by using `write-file' (bug#12507)
2cdf1fd261 Fix filing messages when 'rmail-output-reset-deleted-flag'...
a72db8ab8b Make file copying in tramp-gvfs more robust
f31cacd1ff Revert "Fix incorrect handling of module runtime and envir...
cdc632fbe6 Fix incorrect handling of module runtime and environment p...
c9160bda78 CC Mode: Fix error in cache handling.  This fixes bug #43481

1  2 
lisp/bookmark.el
lisp/net/eww.el
lisp/net/tramp-gvfs.el
lisp/progmodes/cc-engine.el

Simple merge
diff --cc lisp/net/eww.el
Simple merge
Simple merge
Simple merge