diff options
| author | Kaushal | 2015-08-21 14:14:20 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2015-08-21 14:14:20 +0200 |
| commit | 244a00860b6fe1d6acf92948c5c0d1ef0f8426fa (patch) | |
| tree | 7243c69fa71f42c64c04a7b41a155b4d6e609802 | |
| parent | 8c01e88921f00e5b5807541c8d3a8872912e79c5 (diff) | |
| download | emacs-244a00860b6fe1d6acf92948c5c0d1ef0f8426fa.tar.gz emacs-244a00860b6fe1d6acf92948c5c0d1ef0f8426fa.zip | |
In woman.el use `display-buffer' instead of `switch-to-buffer'
* lisp/woman.el (woman-really-find-file, WoMan-find-buffer): Use
`display-buffer' instead of `switch-to-buffer'.
Copyright-paperwork-exempt: yes
| -rw-r--r-- | lisp/woman.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/woman.el b/lisp/woman.el index 75c3d2e3822..e903caaea30 100644 --- a/lisp/woman.el +++ b/lisp/woman.el | |||
| @@ -1651,7 +1651,7 @@ Do not call directly!" | |||
| 1651 | (setq woman-frame (make-frame))))) | 1651 | (setq woman-frame (make-frame))))) |
| 1652 | (set-buffer (get-buffer-create bufname)) | 1652 | (set-buffer (get-buffer-create bufname)) |
| 1653 | (condition-case nil | 1653 | (condition-case nil |
| 1654 | (switch-to-buffer (current-buffer)) | 1654 | (display-buffer (current-buffer)) |
| 1655 | (error (pop-to-buffer (current-buffer)))) | 1655 | (error (pop-to-buffer (current-buffer)))) |
| 1656 | (buffer-disable-undo) | 1656 | (buffer-disable-undo) |
| 1657 | (setq buffer-read-only nil) | 1657 | (setq buffer-read-only nil) |
| @@ -2061,14 +2061,14 @@ alist in `woman-buffer-alist' and return nil." | |||
| 2061 | (if (zerop woman-buffer-number) | 2061 | (if (zerop woman-buffer-number) |
| 2062 | (let ((buffer (get-buffer (cdr (car woman-buffer-alist))))) | 2062 | (let ((buffer (get-buffer (cdr (car woman-buffer-alist))))) |
| 2063 | (if buffer | 2063 | (if buffer |
| 2064 | (switch-to-buffer buffer) | 2064 | (display-buffer buffer) |
| 2065 | ;; Delete alist element: | 2065 | ;; Delete alist element: |
| 2066 | (setq woman-buffer-alist (cdr woman-buffer-alist)) | 2066 | (setq woman-buffer-alist (cdr woman-buffer-alist)) |
| 2067 | nil)) | 2067 | nil)) |
| 2068 | (let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist)) | 2068 | (let* ((prev-ptr (nthcdr (1- woman-buffer-number) woman-buffer-alist)) |
| 2069 | (buffer (get-buffer (cdr (car (cdr prev-ptr)))))) | 2069 | (buffer (get-buffer (cdr (car (cdr prev-ptr)))))) |
| 2070 | (if buffer | 2070 | (if buffer |
| 2071 | (switch-to-buffer buffer) | 2071 | (display-buffer buffer) |
| 2072 | ;; Delete alist element: | 2072 | ;; Delete alist element: |
| 2073 | (setcdr prev-ptr (cdr (cdr prev-ptr))) | 2073 | (setcdr prev-ptr (cdr (cdr prev-ptr))) |
| 2074 | (if (>= woman-buffer-number (length woman-buffer-alist)) | 2074 | (if (>= woman-buffer-number (length woman-buffer-alist)) |