[Emacs-diffs] master ad6c1be: * lisp/emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus

[Stefan Monnier]

branch: master
commit ad6c1be9230ac8ed517a51778b586055edb952c3
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus
    
    assumptions about window ordering.
---
 etc/NEWS                    |    1 +
 lisp/ChangeLog              |    5 +++++
 lisp/emacs-lisp/checkdoc.el |   17 +++++++++--------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 0295245..f359f91 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -235,6 +235,7 @@ If you need your objects to be named, do it by inheriting 
from `eieio-named'.
 *** The <class> variables are declared obsolete.
 *** The <initarg> variables are declared obsolete.
 *** defgeneric and defmethod are declared obsolete.
+*** `constructor' is now an obsolete alias for `make-instance'.
 
 ** ido
 *** New command `ido-bury-buffer-at-head' bound to C-S-b
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 704ec34..f683150 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-18  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus
+       assumptions about window ordering.
+
 2015-02-16  Kelly Dean  <address@hidden>
 
        * lisp/files.el (insert-file-contents-literally): Fix docstring typo.
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 47b6e5f..288e25e 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2619,14 +2619,15 @@ function called to create the messages."
 (defun checkdoc-show-diagnostics ()
   "Display the checkdoc diagnostic buffer in a temporary window."
   (if checkdoc-pending-errors
-      (let ((b (get-buffer checkdoc-diagnostic-buffer)))
-       (if b (progn (pop-to-buffer b)
-                    (goto-char (point-max))
-                    (re-search-backward "\C-l" nil t)
-                    (beginning-of-line)
-                    (forward-line 1)
-                    (recenter 0)))
-       (other-window -1)
+      (let* ((b (get-buffer checkdoc-diagnostic-buffer))
+             (win (if b (display-buffer b))))
+       (when win
+          (with-selected-window win
+            (goto-char (point-max))
+            (re-search-backward "\C-l" nil t)
+            (beginning-of-line)
+            (forward-line 1)
+            (recenter 0)))
        (setq checkdoc-pending-errors nil)
        nil)))