mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-07 15:21:46 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Glenn Morris 2014-10-15 21:49:34 -04:00
commit 10471ae361
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -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.

2
lisp/ChangeLog.16
View File

@ -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>

21
lisp/cus-edit.el
View File

@ -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

2
src/ChangeLog.12
View File

@ -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>