* lisp/textmodes/remember.el (remember): set buffer-offer-save in

remember buffers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfbe5b49eb8f9447d6ee657fbfeecdf51863d868..2902d9281fbac4eac9c060e374217dd8d92702a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18  Reuben Thomas  <rrt@sc3d.org>
+
+       * textmodes/remember.el (remember): set buffer-offer-save in
+       remember buffers (bug#13566).
+
 2013-10-18  Daniel Colascione  <dancol@dancol.org>
 
        When evaluating forms in ielm, direct standard output to ielm
@@ -6905,6 +6910,7 @@
        * progmodes/f90.el (f90-imenu-generic-expression):
        Fix typo in 2013-05-08 change.  (Bug#14402)
 
+>>>>>>> MERGE-SOURCE
 2013-05-14  Jean-Philippe Gravel  <jpgravel@gmail.com>
 
        * progmodes/gdb-mi.el (gdb-running, gdb-starting):

diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 39f3acd2c4c83e9579e77aab3d6a81a818d32660..e44f12d1db8e1b39fe59f73572f7fe971e95c701 100644 (file)
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -294,6 +294,7 @@ With a prefix or a visible region, use the region as INITIAL."
     (if remember-in-new-frame
         (set-window-dedicated-p
          (get-buffer-window (current-buffer) (selected-frame)) t))
+    (setq buffer-offer-save t)
     (remember-mode)
     (when (= (point-max) (point-min))
       (when initial (insert initial))