aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-10-09 14:33:56 +0200
committerMartin Rudalics2011-10-09 14:33:56 +0200
commit496774950d0095eb8e2618a7657d81cdde150df9 (patch)
tree20e4d2185b29ae6717e119e3b4a25159cd25e1e0
parentd83dc65b3f42fae9b2085b9a1ca986c401d49f8d (diff)
downloademacs-496774950d0095eb8e2618a7657d81cdde150df9.tar.gz
emacs-496774950d0095eb8e2618a7657d81cdde150df9.zip
Add version tag for frame-auto-hide-function (Bug#9699).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f60616a1b29..1eaf61ad3c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-10-09 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (frame-auto-hide-function): Add version tag.
4 (Bug#9699)
5
12011-10-09 Michael Albinus <michael.albinus@gmx.de> 62011-10-09 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-file-name-handler): Add 'debug to the error 8 * net/tramp.el (tramp-file-name-handler): Add 'debug to the error
diff --git a/lisp/window.el b/lisp/window.el
index 79629c9c285..4a421852f82 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2772,7 +2772,8 @@ shown in a separate frame like `quit-window' and `bury-buffer'."
2772 (const :tag "Do nothing" ignore) 2772 (const :tag "Do nothing" ignore)
2773 function) 2773 function)
2774 :group 'windows 2774 :group 'windows
2775 :group 'frames) 2775 :group 'frames
2776 :version "24.1")
2776 2777
2777(defun window--delete (&optional window dedicated-only kill) 2778(defun window--delete (&optional window dedicated-only kill)
2778 "Delete WINDOW if possible. 2779 "Delete WINDOW if possible.