Commit f78e4f34 authored by Linus Tolke Y's avatar Linus Tolke Y

Bugfix. Nu fungerar kom-write-texts-in-window med värdena new-frame

och other-frame.
parent b9e186a0
......@@ -76,7 +76,8 @@ Does lyskom-end-of-command."
(lyskom-end-of-command)
(let ((buffer (generate-new-buffer
(concat (buffer-name (process-buffer proc)) "-edit")))
(config (current-window-configuration)))
(config (current-window-configuration))
(the-dedicated-frame nil))
(setq lyskom-list-of-edit-buffers (cons buffer
lyskom-list-of-edit-buffers))
(condition-case emacs-18\.55
......@@ -95,15 +96,20 @@ Does lyskom-end-of-command."
(switch-to-buffer-other-window buffer))
((and (eq kom-write-texts-in-window 'other-frame)
(not (eq (selected-frame) (next-frame))))
(select-frame (next-frame)))
(select-frame (next-frame))
(switch-to-buffer buffer))
((eq kom-write-texts-in-window 'new-frame)
(make-local-variable 'lyskom-is-dedicated-edit-window)
(setq lyskom-is-dedicated-edit-window t)
(switch-to-buffer-other-frame buffer))
(switch-to-buffer-other-frame buffer)
(setq the-dedicated-frame
(window-frame (get-buffer-window (current-buffer) nil))))
(t
(switch-to-buffer buffer)))
(lyskom-edit-mode)
(setq lyskom-proc proc)
(if the-dedicated-frame
(progn
(make-local-variable 'lyskom-is-dedicated-edit-window)
(setq lyskom-is-dedicated-edit-window the-dedicated-frame)))
(make-local-variable 'lyskom-edit-handler)
(make-local-variable 'lyskom-edit-handler-data)
(make-local-variable 'lyskom-edit-return-to-configuration)
......@@ -346,7 +352,9 @@ Entry to this mode runs lyskom-edit-mode-hook."
(if kom-dont-restore-window-after-editing
(bury-buffer)
(save-excursion
(if (boundp 'lyskom-is-dedicated-edit-window)
(if (and (boundp 'lyskom-is-dedicated-edit-window)
(eq lyskom-is-dedicated-edit-window
(window-frame (get-buffer-window (current-buffer) nil))))
(condition-case error
(delete-frame)
(error))))
......@@ -363,7 +371,9 @@ Entry to this mode runs lyskom-edit-mode-hook."
(bury-buffer)
;; Select the old configuration.
(save-excursion
(if (boundp 'lyskom-is-dedicated-edit-window)
(if (and (boundp 'lyskom-is-dedicated-edit-window)
(eq lyskom-is-dedicated-edit-window
(window-frame (get-buffer-window (current-buffer) nil))))
(condition-case error
(delete-frame)
(error))))
......
......@@ -59,7 +59,11 @@ This variable is not saved. It should be set in your .emacs")
'other means edit in another window. Creating that window if necessary.
A buffer or buffer name means use the first window displaying that buffer.
If no window is displaying that buffer or the buffer does not exits then it
uses the same window.")
uses the same window.
'other-frame means choose another frame. 'new-frame means create a frame
exclusively for this purpose.
The choices 'other-frame and 'new-frame requires you to have an emacs running
under a window-system.")
(defvar kom-created-texts-are-read t
"*Non-nil means automatically mark texts that you create as read.")
......@@ -172,8 +176,12 @@ nonexistent) buffer in which the message is inserted.")
kom-show-personal-messages-in-buffer decides which buffer to pop.")
(defvar kom-ding-on-personal-messages t
"*Non-nil means ding as personal messages arrive.
Non-nil and non-t means only ding when they really are personal.")
"*Controls ding as personal messages arrive.
nil -> always silent
t -> always ding
'personal -> only when really personal messages are recieved
'group -> only when messages to groups are recieved
otherwize undefined.")
(defvar kom-confirm-multiple-recipients t
"*Non-nil means ask the user for confirmation about recipients.
......
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