Commit 26a30fea authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(ebrowse-view-file-other-window): Delete function.

(ebrowse-view/find-file-and-search-pattern): Call view-file-other-window
instead of ebrowse-view-file-other-window.
(ebrowse-view-file-other-frame): Don't call current-window-configuration.
Fix second argument in the call to view-mode-enter.  Doc fix.
parent 374c0cd6
2008-01-12 Eli Zaretskii <eliz@gnu.org>
* progmodes/ebrowse.el (ebrowse-view-file-other-window): Delete
function.
(ebrowse-view/find-file-and-search-pattern): Call
view-file-other-window instead of ebrowse-view-file-other-window.
(ebrowse-view-file-other-frame): Don't call
current-window-configuration. Fix second argument in the call to
view-mode-enter. Doc fix.
2008-01-11 Richard Stallman <rms@gnu.org> 2008-01-11 Richard Stallman <rms@gnu.org>
   
* subr.el (atomic-change-group): Prevent undo list truncation. * subr.el (atomic-change-group): Prevent undo list truncation.
...@@ -1613,21 +1613,6 @@ and (b) in the directories named in `ebrowse-search-path'." ...@@ -1613,21 +1613,6 @@ and (b) in the directories named in `ebrowse-search-path'."
file-name)) file-name))
(defun ebrowse-view-file-other-window (file)
"View a file FILE in another window.
This is a replacement for `view-file-other-window' which does not
seem to work. It should be removed when `view.el' is fixed."
(interactive)
(let ((old-arrangement (current-window-configuration))
(had-a-buf (get-file-buffer file))
(buf-to-view (find-file-noselect file)))
(switch-to-buffer-other-window buf-to-view)
(view-mode-enter old-arrangement
(and (not had-a-buf)
(not (buffer-modified-p buf-to-view))
'kill-buffer))))
(defun ebrowse-view-exit-fn (buffer) (defun ebrowse-view-exit-fn (buffer)
"Function called when exiting View mode in BUFFER. "Function called when exiting View mode in BUFFER.
Restore frame configuration active before viewing the file, Restore frame configuration active before viewing the file,
...@@ -1648,10 +1633,9 @@ and possibly kill the viewed buffer." ...@@ -1648,10 +1633,9 @@ and possibly kill the viewed buffer."
(defun ebrowse-view-file-other-frame (file) (defun ebrowse-view-file-other-frame (file)
"View a file FILE in another frame. "View a file FILE in another frame.
The new frame is deleted when it is no longer used." The new frame is deleted when you quit viewing the file in that frame."
(interactive) (interactive)
(let ((old-frame-configuration (current-frame-configuration)) (let ((old-frame-configuration (current-frame-configuration))
(old-arrangement (current-window-configuration))
(had-a-buf (get-file-buffer file)) (had-a-buf (get-file-buffer file))
(buf-to-view (find-file-noselect file))) (buf-to-view (find-file-noselect file)))
(switch-to-buffer-other-frame buf-to-view) (switch-to-buffer-other-frame buf-to-view)
...@@ -1662,8 +1646,8 @@ The new frame is deleted when it is no longer used." ...@@ -1662,8 +1646,8 @@ The new frame is deleted when it is no longer used."
(and (not had-a-buf) (and (not had-a-buf)
(not (buffer-modified-p buf-to-view)) (not (buffer-modified-p buf-to-view))
'kill-buffer)) 'kill-buffer))
(view-mode-enter old-arrangement 'ebrowse-view-exit-fn))) (view-mode-enter (cons (selected-window) (cons (selected-window) t))
'ebrowse-view-exit-fn)))
(defun ebrowse-view/find-file-and-search-pattern (defun ebrowse-view/find-file-and-search-pattern
(struc info file tags-file-name &optional view where) (struc info file tags-file-name &optional view where)
...@@ -1698,7 +1682,7 @@ specifies where to find/view the result." ...@@ -1698,7 +1682,7 @@ specifies where to find/view the result."
(setq view-mode-hook nil)) (setq view-mode-hook nil))
(push 'ebrowse-find-pattern view-mode-hook) (push 'ebrowse-find-pattern view-mode-hook)
(case where (case where
(other-window (ebrowse-view-file-other-window file)) (other-window (view-file-other-window file))
(other-frame (ebrowse-view-file-other-frame file)) (other-frame (ebrowse-view-file-other-frame file))
(t (view-file file)))) (t (view-file file))))
(t (t
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment