aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/subr.el1
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95b69ec7712..5dbd7fb4bf1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-07-25 Martin Rudalics <rudalics@gmx.at>
2
3 * subr.el (redirect-frame-focus): Add advertised calling
4 convention (Bug#12030).
5
12012-07-25 Paul Eggert <eggert@cs.ucla.edu> 62012-07-25 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Prefer typical American spelling for "acknowledgment". 8 Prefer typical American spelling for "acknowledgment".
@@ -570,7 +575,7 @@
5702012-07-06 Dmitry Gutov <dgutov@yandex.ru> 5752012-07-06 Dmitry Gutov <dgutov@yandex.ru>
571 576
572 * window.el (quit-window): Always restore window height when 577 * window.el (quit-window): Always restore window height when
573 it's saved in quit-restore parameter. 578 it's saved in quit-restore parameter (Bug#11810).
574 579
5752012-07-06 Glenn Morris <rgm@gnu.org> 5802012-07-06 Glenn Morris <rgm@gnu.org>
576 581
diff --git a/lisp/subr.el b/lisp/subr.el
index 0afe33c6a4c..882ad3cd23d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1184,6 +1184,7 @@ is converted into a string by expressing it in decimal."
1184(set-advertised-calling-convention 1184(set-advertised-calling-convention
1185 'all-completions '(string collection &optional predicate) "23.1") 1185 'all-completions '(string collection &optional predicate) "23.1")
1186(set-advertised-calling-convention 'unintern '(name obarray) "23.3") 1186(set-advertised-calling-convention 'unintern '(name obarray) "23.3")
1187(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.2")
1187 1188
1188;;;; Obsolescence declarations for variables, and aliases. 1189;;;; Obsolescence declarations for variables, and aliases.
1189 1190