aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-12-21 20:02:20 +0000
committerStefan Monnier2005-12-21 20:02:20 +0000
commit398de7181d468e168b9face80f5a4015aebf5abd (patch)
tree2692561df707e5ef64df2a70f19d69c231bf7856
parenta425bd036ee1f22e6f7f4c4f7222371b10ff189f (diff)
downloademacs-398de7181d468e168b9face80f5a4015aebf5abd.tar.gz
emacs-398de7181d468e168b9face80f5a4015aebf5abd.zip
(lisp-complete-symbol): Don't call delete-windows-on with an inexistent buffer.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/emacs-lisp/lisp.el5
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 159632e3c9d..eabd584c585 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
12005-12-21 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/lisp.el (lisp-complete-symbol): Don't call
4 delete-windows-on with an inexistent buffer.
5
12005-12-22 Nick Roberts <nickrob@snap.net.nz> 62005-12-22 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/gud.el (gud-tooltip-modes, gud-tooltip-display): 8 * progmodes/gud.el (gud-tooltip-modes, gud-tooltip-display):
4 Delete defcustom variable :tag names. 9 Delete defcustom variable :tag names.
5 10
62005-12-20 Stefan Monnier <monnier@iro.umontreal.ca> 112005-12-20 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 7aeb33a648e..5d593ecb9fd 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -589,8 +589,9 @@ considered."
589 (if (> (length list) 1) 589 (if (> (length list) 1)
590 (with-output-to-temp-buffer "*Completions*" 590 (with-output-to-temp-buffer "*Completions*"
591 (display-completion-list list pattern)) 591 (display-completion-list list pattern))
592 (delete-windows-on "*Completions*"))) 592 (if (get-buffer "*Completions*")
593 (delete-windows-on "*Completions*"))))
593 (message "Making completion list...%s" "done"))))))) 594 (message "Making completion list...%s" "done")))))))
594 595
595;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e 596;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
596;;; lisp.el ends here 597;;; lisp.el ends here