[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118131: Merge from emacs-24; up to r117589
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118131: Merge from emacs-24; up to r117589 |
Date: |
Thu, 16 Oct 2014 01:50:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118131 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-15 21:49:34 -0400
message:
Merge from emacs-24; up to r117589
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/ChangeLog.16 changelog.16-20130618111706-x8cck4o4rjixg8cl-1
lisp/cus-edit.el cusedit.el-20091113204419-o5vbwnq5f7feedwu-1091
src/ChangeLog.12 changelog.12-20130618111706-x8cck4o4rjixg8cl-2
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-15 17:32:41 +0000
+++ b/lisp/ChangeLog 2014-10-16 01:49:34 +0000
@@ -1,3 +1,10 @@
+2014-10-16 Alan Mackenzie <address@hidden>
+
+ * 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 <address@hidden>
* emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.
=== modified file 'lisp/ChangeLog.16'
--- a/lisp/ChangeLog.16 2014-09-24 19:23:13 +0000
+++ b/lisp/ChangeLog.16 2014-10-16 01:49:34 +0000
@@ -1,6 +1,6 @@
2013-03-11 Glenn Morris <address@hidden>
- * Version 24.3 released.
+ * Merge in all changes up to version 24.3 release.
2013-03-11 Stefan Monnier <address@hidden>
=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el 2014-06-29 02:33:50 +0000
+++ b/lisp/cus-edit.el 2014-10-15 15:23:27 +0000
@@ -779,7 +779,8 @@
"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 @@
;; 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
=== modified file 'src/ChangeLog.12'
--- a/src/ChangeLog.12 2014-01-21 08:49:46 +0000
+++ b/src/ChangeLog.12 2014-10-16 01:47:10 +0000
@@ -1,6 +1,6 @@
2013-03-11 Glenn Morris <address@hidden>
- * Version 24.3 released.
+ * Merge in all changes up to version 24.3 release.
2013-03-11 Paul Eggert <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118131: Merge from emacs-24; up to r117589,
Glenn Morris <=