diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-18 11:04:15 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-18 11:04:15 -0500 |
| commit | ad6c1be9230ac8ed517a51778b586055edb952c3 (patch) | |
| tree | ac42432f2893ee64c4fb91c6844afa663baf97da | |
| parent | 81d89d88aef5de720e7fbeecbfb295d6eaf6fd37 (diff) | |
| download | emacs-ad6c1be9230ac8ed517a51778b586055edb952c3.tar.gz | |
* lisp/emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus
assumptions about window ordering.
| -rw-r--r-- | etc/NEWS | 1 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 17 |
3 files changed, 15 insertions, 8 deletions
@@ -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 704ec34606c..f6831508471 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus + assumptions about window ordering. + 2015-02-16 Kelly Dean <kelly@prtime.org> * 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 47b6e5f81de..288e25e6060 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))) |