[Emacs-diffs] /srv/bzr/emacs/trunk r105635: lisp/window.el (frame-auto-delete, window-deletable-p): Doc fix.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105635
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-01 20:51:42 +0300
message:
  lisp/window.el (frame-auto-delete, window-deletable-p): Doc fix.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-01 17:04:30 +0000
+++ b/lisp/ChangeLog    2011-09-01 17:51:42 +0000
@@ -1,3 +1,7 @@
+2011-09-01  Eli Zaretskii  <address@hidden>
+
+       * window.el (frame-auto-delete, window-deletable-p): Doc fix.
+
 2011-09-01  Chong Yidong  <address@hidden>
 
        * window.el (display-buffer): Restore interactive spec.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-01 17:04:30 +0000
+++ b/lisp/window.el    2011-09-01 17:51:42 +0000
@@ -2259,10 +2259,10 @@
 
 ;;; Deleting windows.
 (defcustom frame-auto-delete 'automatic
-  "If non-nil, quitting a window can delete it's frame.
+  "If non-nil, quitting a window can delete its frame.
 If this variable is nil, functions that quit a window never
-delete the associated frame.  If this variable equals the symbol
-`automatic', a frame is deleted only if it the window is
+delete the associated frame.  If this variable's value is the
+symbol `automatic', a frame is deleted only if the window is
 dedicated or was created by `display-buffer'.  If this variable
 is t, a frame can be always deleted, even if it was created by
 `make-frame-command'.  Other values should not be used.
@@ -2282,8 +2282,8 @@
 
 (defun window-deletable-p (&optional window)
   "Return t if WINDOW can be safely deleted from its frame.
-Return `frame' if deleting WINDOW should delete its frame
-instead."
+Return `frame' if deleting WINDOW should also delete its
+frame."
   (setq window (window-normalize-any-window window))
   (unless ignore-window-parameters
     ;; Handle atomicity.
@@ -2304,7 +2304,7 @@
                 (other-visible-frames-p frame))
        ;; WINDOW is the root window of its frame.  Return `frame' but
        ;; only if WINDOW is (1) either dedicated or quit-restore's car
-       ;; is new-frame and the window still displays the same buffer
+       ;; is `new-frame' and the window still displays the same buffer
        ;; and (2) there are other frames left.
        'frame))
      ((and (not ignore-window-parameters)