Merge from emacs-24; up to 2014-07-27T18:05:37Z!eliz@gnu.org

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf83767b924167351a4acfe4e948055bc97a63da..13e161e03b7d46c7680163ed66c097c080530b95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-16  Alan Mackenzie  <acm@muc.de>
+
+       * cus-edit.el (custom-command-apply): Specify the return value in
+       the doc string.
+       (Custom-reset-standard): Save custom-file (e.g. .emacs) only when
+       custom-command-apply has returned non-nil.
+
 2014-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.

diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index b4c475aff10cda8142c40d7397a62ae129e788f0..42f3a3be66f50cd67388895a42c8cab9fc33de23 100644 (file)
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -1,6 +1,6 @@
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
-       * Version 24.3 released.
+       * Merge in all changes up to version 24.3 release.
 
 2013-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b54898a171c684cf1ec9490e6328852bd614930a..c8e9b90437d607112c8c9eabd223ea3e98dd5a09 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -779,7 +779,8 @@ when the action is chosen.")
   "Call function FUN on all widgets in `custom-options'.
 If there is more than one widget, ask user for confirmation using
 the query string QUERY, using `y-or-n-p' if STRONG-QUERY is nil,
-and `yes-or-no-p' otherwise."
+and `yes-or-no-p' otherwise.  Return non-nil if the functionality
+has been executed, nil otherwise."
   (if (or (and (= 1 (length custom-options))
               (memq (widget-type (car custom-options))
                     '(custom-variable custom-face)))
@@ -892,16 +893,16 @@ making them as if they had never been customized at all."
   ;; Bind these temporarily.
   (let ((custom-reset-standard-variables-list '(t))
        (custom-reset-standard-faces-list '(t)))
-    (custom-command-apply
-     (lambda (widget)
-       (and (or (null (widget-get widget :custom-standard-value))
-               (widget-apply widget :custom-standard-value))
-           (memq (widget-get widget :custom-state)
-                 '(modified set changed saved rogue))
-           (widget-apply widget :custom-mark-to-reset-standard)))
-     "The settings will revert to their default values, in this
+    (if (custom-command-apply
+        (lambda (widget)
+          (and (or (null (widget-get widget :custom-standard-value))
+                   (widget-apply widget :custom-standard-value))
+               (memq (widget-get widget :custom-state)
+                     '(modified set changed saved rogue))
+               (widget-apply widget :custom-mark-to-reset-standard)))
+        "The settings will revert to their default values, in this
 and future sessions.  Really erase customizations? " t)
-    (custom-reset-standard-save-and-update)))
+       (custom-reset-standard-save-and-update))))
 
 ;;; The Customize Commands
 

diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index c5ea7e7bad27adc0d3ebf982247636b410485fe0..80d7460c734491bb628e3ac5bfe330157de16376 100644 (file)
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -1,6 +1,6 @@
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
-        * Version 24.3 released.
+       * Merge in all changes up to version 24.3 release.
 
 2013-03-11  Paul Eggert  <eggert@cs.ucla.edu>