[Emacs-diffs] /srv/bzr/emacs/trunk r109584: * lisp/subr.el (internal--before-with-selected-window)

[Stefan Monnier]

------------------------------------------------------------
revno: 109584
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-13 10:12:47 -0400
message:
  * lisp/subr.el (internal--before-with-selected-window)
  (internal--after-with-selected-window): Fix typo seleted->selected.
  (with-selected-window): Adjust callers.
  Reported by Dmitry Gutov <address@hidden>.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-08-10 16:02:48 +0000
+++ b/etc/NEWS  2012-08-13 14:12:47 +0000
@@ -200,18 +200,32 @@
 `term-color-<COLOR>', `term-color-underline' and `term-color-bold'
 faces.
 
-** CL's main entry is now (require 'cl-lib).
+** CL
+*** CL's main entry is now (require 'cl-lib).
 `cl-lib' is like the old `cl' except that it uses the namespace cleanly,
-i.e. all its definitions have the "cl-" prefix.
+i.e. all its definitions have the "cl-" prefix (and internal definitions use
+the "cl--" prefix).
 
 If `cl' provided a feature under the name `foo', then `cl-lib' provides it
 under the name `cl-foo' instead, with the exceptions of the few definitions
 that had to use `foo*' to avoid conflicts with pre-existing Elisp entities,
 which have not been renamed to `cl-foo*' but just `cl-foo'.
 
-The old `cl' is now deprecated and is nothing more than a bunch of aliases that
+The old `cl' is now deprecated and is just a bunch of aliases that
 provide the old non-prefixed names.
 
+*** `cl-flet' is not like `flet' (which is deprecated).
+Instead it obeys the behavior of Common-Lisp's `flet'.
+
+*** `cl-labels' is slightly different from `labels'.
+The difference is that it relies on the `lexical-binding' machinery (as opposed
+to the `lexical-let' machinery used previously) to capture definitions in
+closures, so such closures will only work if `lexical-binding' is in use.
+
+*** `progv' was rewritten to use the `let' machinery.
+A side effect is that vars without corresponding value are bound to nil
+rather than making them unbound.
+
 ** Desktop
 
 *** `desktop-path' no longer includes the "." directory.  Desktop

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-13 14:05:24 +0000
+++ b/lisp/ChangeLog    2012-08-13 14:12:47 +0000
@@ -1,3 +1,10 @@
+2012-08-13  Stefan Monnier  <address@hidden>
+
+       * subr.el (internal--before-with-selected-window)
+       (internal--after-with-selected-window): Fix typo seleted->selected.
+       (with-selected-window): Adjust callers.
+       Reported by Dmitry Gutov <address@hidden>.
+
 2012-08-13  Bastien Guerry  <address@hidden>
 
        * window.el (special-display-popup-frame): Small docstring

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-08-13 07:25:30 +0000
+++ b/lisp/subr.el      2012-08-13 14:12:47 +0000
@@ -3023,7 +3023,7 @@
      (set-buffer ,buffer-or-name)
      ,@body))
 
-(defun internal--before-with-seleted-window (window)
+(defun internal--before-with-selected-window (window)
   (let ((other-frame (window-frame window)))
     (list window (selected-window)
           ;; Selecting a window on another frame also changes that
@@ -3034,7 +3034,7 @@
           (unless (eq (selected-frame) other-frame)
             (tty-top-frame other-frame)))))
 
-(defun internal--after-with-seleted-window (state)
+(defun internal--after-with-selected-window (state)
   ;; First reset frame-selected-window.
   (when (window-live-p (nth 2 state))
     ;; We don't use set-frame-selected-window because it does not
@@ -3065,12 +3065,12 @@
 the buffer list ordering."
   (declare (indent 1) (debug t))
   `(let ((save-selected-window--state
-          (internal--before-with-seleted-window ,window)))
+          (internal--before-with-selected-window ,window)))
      (save-current-buffer
        (unwind-protect
            (progn (select-window (car save-selected-window--state) 'norecord)
                  ,@body)
-         (internal--after-with-seleted-window save-selected-window--state)))))
+         (internal--after-with-selected-window save-selected-window--state)))))
 
 (defmacro with-selected-frame (frame &rest body)
   "Execute the forms in BODY with FRAME as the selected frame.