Commit bf6fefe6 authored by David Byers's avatar David Byers
Browse files

No commit message

No commit message
parent 4ba58ea8
Thu Jul 17 09:55:37 1997 David Byers <davby@ida.liu.se>
* edit-text.el (lyskom-dispatch-edit-text): Kasta undoinformation
fre insttning av miscs.
* lyskom-rest.el (lyskom-next-command): Bugga inte om kommandot r
nil.
(lyskom-format-aux-help): Skriv ut kommandot nil ocks.
(lyskom-what-to-do-when-done): nil r inte ett giltigt kommando.
(lyskom-what-to-do-when-done): kom-display-time fr man om man
inget annat har i listan.
* startup.el (lyskom): Fixade s www-proxy faktist fungerade.
Wed Jul 16 11:05:21 1997 David Byers <davby@ida.liu.se>
* startup.el (lyskom): Kunna kra genom www-proxy.
* buffers.el (lyskom-undisplay-buffer): ndra inte
fnsterkonfigurationen bufferten inte r roten i hierarkin man
hller p dda.
* lyskom-rest.el (lyskom-filter): Stt bara buffert till
old-buffer om den fortfarande r vid liv.
Tue Jul 15 10:56:50 1997 David Byers <davby@ida.liu.se> Tue Jul 15 10:56:50 1997 David Byers <davby@ida.liu.se>
* lyskom-rest.el (lyskom-format-format): Lgg till D,S och C i
regexpen.
* english-strings.el,swedish-strings.el (kom-tell-phrases): Anvnd
anvndarens kom-tell-phrases om den finns.
* vars.el.in (lyskom-line-start-chars): Stt till nil. * vars.el.in (lyskom-line-start-chars): Stt till nil.
* lyskom-rest.el (lyskom-line-start-chars): Stt vrdet hr. * lyskom-rest.el (lyskom-line-start-chars): Stt vrdet hr.
......
...@@ -68,6 +68,9 @@ they are created.") ...@@ -68,6 +68,9 @@ they are created.")
(defvar lyskom-buffer-parent nil (defvar lyskom-buffer-parent nil
"Parent of buffer") "Parent of buffer")
(defvar lyskom-killing-hierarchy nil
"Non-nil while killing a buffer hierarchy.")
(make-variable-buffer-local 'lyskom-buffer-parent) (make-variable-buffer-local 'lyskom-buffer-parent)
(lyskom-protect-variable 'lyskom-buffer-parent) (lyskom-protect-variable 'lyskom-buffer-parent)
...@@ -151,7 +154,9 @@ the children object" ...@@ -151,7 +154,9 @@ the children object"
(defun lyskom-buffer-hierarchy-kill-hook () (defun lyskom-buffer-hierarchy-kill-hook ()
"When killing a buffer, enure that its children also die" "When killing a buffer, enure that its children also die"
(let ((kill-buffer-query-functions nil)) (let ((kill-buffer-query-functions nil)
(lyskom-killing-hierarchy (or lyskom-killing-hierarchy
(current-buffer))))
(lyskom-set-buffer-parent (current-buffer) nil) (lyskom-set-buffer-parent (current-buffer) nil)
(let ((buflist (lyskom-get-buffer-children (current-buffer)))) (let ((buflist (lyskom-get-buffer-children (current-buffer))))
(while buflist (while buflist
...@@ -197,6 +202,9 @@ categories") ...@@ -197,6 +202,9 @@ categories")
protected protected
local) local)
(defvar lyskom-undisplaying-hierarchy nil
"The top of the buffer hierarchy being undisplayed.")
(defun lyskom-clean-up-buffer-category (cat) (defun lyskom-clean-up-buffer-category (cat)
...@@ -464,6 +472,8 @@ buffer" ...@@ -464,6 +472,8 @@ buffer"
lyskom-dedicated-frame)) lyskom-dedicated-frame))
(dedicated-window (and (boundp 'lyskom-dedicated-window) (dedicated-window (and (boundp 'lyskom-dedicated-window)
lyskom-dedicated-window)) lyskom-dedicated-window))
(lyskom-undisplaying-hierarchy (or buffer
lyskom-undisplaying-hierarchy))
(saved-window-configuration (saved-window-configuration
(and (boundp 'lyskom-saved-window-configuration) (and (boundp 'lyskom-saved-window-configuration)
lyskom-saved-window-configuration))) lyskom-saved-window-configuration)))
...@@ -483,6 +493,11 @@ buffer" ...@@ -483,6 +493,11 @@ buffer"
(delete-frame dedicated-frame) (delete-frame dedicated-frame)
(setq dedicated-frame nil))) (setq dedicated-frame nil)))
((and lyskom-killing-hierarchy
(not (eq lyskom-killing-hierarchy buffer))) nil)
((and lyskom-undisplaying-hierarchy
(not (eq lyskom-undisplaying-hierarchy buffer))) nil)
(dedicated-window (dedicated-window
(when (and (window-live-p dedicated-window) (when (and (window-live-p dedicated-window)
(eq (get-buffer buffer) (eq (get-buffer buffer)
......
...@@ -100,7 +100,9 @@ Does lyskom-end-of-command." ...@@ -100,7 +100,9 @@ Does lyskom-end-of-command."
(setq lyskom-edit-handler handler) (setq lyskom-edit-handler handler)
(setq lyskom-edit-handler-data data) (setq lyskom-edit-handler-data data)
(setq lyskom-edit-return-to-configuration config) (setq lyskom-edit-return-to-configuration config)
(buffer-disable-undo)
(lyskom-edit-insert-miscs misc-list subject body) (lyskom-edit-insert-miscs misc-list subject body)
(buffer-enable-undo)
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward (regexp-quote (lyskom-get-string (re-search-forward (regexp-quote (lyskom-get-string
'header-subject)) 'header-subject))
......
...@@ -2431,6 +2431,18 @@ Lists etc. : [INS] Add a line [DEL] Remove a line [*] Modify") ...@@ -2431,6 +2431,18 @@ Lists etc. : [INS] Add a line [DEL] Remove a line [*] Modify")
;;; kom-tell-phrases-validation-list in vars.el if you add or remove ;;; kom-tell-phrases-validation-list in vars.el if you add or remove
;;; one of these. ;;; one of these.
(eval-when-compile (defvar kom-tell-phrases))
(if (and (boundp 'kom-tell-phrases)
kom-tell-phrases)
(lyskom-language-strings kom-tell-phrases sv
(mapcar (function
(lambda (x)
(cond ((not (consp x)) x)
((not (consp (cdr x))) x)
((not (= (length (cdr x)) 1)) x)
(t (cons (car x) (car (cdr x)))))))
kom-tell-phrases))
(lyskom-language-strings kom-tell-phrases en (lyskom-language-strings kom-tell-phrases en
'((kom-tell-silence . "") ; Why ? '((kom-tell-silence . "") ; Why ?
(kom-tell-send . "Is trying to post an article.") (kom-tell-send . "Is trying to post an article.")
...@@ -2449,7 +2461,7 @@ Lists etc. : [INS] Add a line [DEL] Remove a line [*] Modify") ...@@ -2449,7 +2461,7 @@ Lists etc. : [INS] Add a line [DEL] Remove a line [*] Modify")
(kom-tell-review . "Is reviewing.") (kom-tell-review . "Is reviewing.")
(kom-tell-change-name . "Takes on a new name.") (kom-tell-change-name . "Takes on a new name.")
(kom-tell-change-supervisor . "Changes the supervisor of something.") (kom-tell-change-supervisor . "Changes the supervisor of something.")
(kom-tell-next-lyskom . "Moves to a different LysKOM."))) (kom-tell-next-lyskom . "Moves to a different LysKOM."))))
;; Placed here because this must NOT be evaluated before ;; Placed here because this must NOT be evaluated before
......
...@@ -234,7 +234,8 @@ If the optional argument REFETCH is non-nil, `lyskom-refetch' is called." ...@@ -234,7 +234,8 @@ If the optional argument REFETCH is non-nil, `lyskom-refetch' is called."
((or (stringp command) ((or (stringp command)
(vectorp command)) (vectorp command))
(execute-kbd-macro command)) (execute-kbd-macro command))
(t (call-interactively command))))) ((commandp command) (call-interactively command))
(t (lyskom-start-of-command nil) (lyskom-end-of-command)))))
((eq lyskom-command-to-do 'unknown) ((eq lyskom-command-to-do 'unknown)
(lyskom-insert (lyskom-insert
(lyskom-get-string 'wait-for-server))) (lyskom-get-string 'wait-for-server)))
...@@ -796,7 +797,7 @@ Args: FORMAT-STRING &rest ARGS" ...@@ -796,7 +797,7 @@ Args: FORMAT-STRING &rest ARGS"
(defvar lyskom-format-format (defvar lyskom-format-format
"%\\(=\\)?\\(-?[0-9]+\\)?\\(#\\([0-9]+\\)\\)?\\(:\\)?\\([][@MmPpnrtsdoxc]\\)" "%\\(=\\)?\\(-?[0-9]+\\)?\\(#\\([0-9]+\\)\\)?\\(:\\)?\\([][@MmPpnrtsdoxcCSD]\\)"
"regexp matching format string parts.") "regexp matching format string parts.")
(defun lyskom-insert-string (atom) (defun lyskom-insert-string (atom)
...@@ -889,6 +890,11 @@ Note that it is not allowed to use deferred insertions in the text." ...@@ -889,6 +890,11 @@ Note that it is not allowed to use deferred insertions in the text."
;;;
;;; If you add a format letter, for goodness' sake, don't forget to
;;; att it to the regexp above too!
;;;
(defun lyskom-format-aux (format-state allow-defer) (defun lyskom-format-aux (format-state allow-defer)
...@@ -1070,11 +1076,11 @@ Note that it is not allowed to use deferred insertions in the text." ...@@ -1070,11 +1076,11 @@ Note that it is not allowed to use deferred insertions in the text."
((vectorp arg) ((vectorp arg)
(mapconcat 'single-key-description (mapconcat 'single-key-description
(append arg nil) " ")) (append arg nil) " "))
((symbolp arg) ((and arg (symbolp arg))
(if (memq arg lyskom-commands) (if (memq arg lyskom-commands)
(lyskom-get-string arg) (lyskom-get-string arg)
(princ arg))) (princ arg)))
(t (format "%S" arg))))) (t (format "(%S)" arg)))))
;; ;;
;; Format a sexp by princing it. Sort of. ;; Format a sexp by princing it. Sort of.
...@@ -2125,11 +2131,13 @@ If optional argument NOCHANGE is non-nil then the list wont be altered." ...@@ -2125,11 +2131,13 @@ If optional argument NOCHANGE is non-nil then the list wont be altered."
(command (command
(cond (cond
((commandp (car now)) (car now)) ((commandp (car now)) (car now))
((and (listp (car next)) ((and (car next)
(listp (car next))
(not (eq (car (car next)) (not (eq (car (car next))
'lambda))) 'lambda)))
(car (setq now (car next)))) (car (setq now (car next))))
(t (car (setq now next)))))) (t (or (car (setq now next))
'kom-display-time)))))
(if nochange (if nochange
nil nil
(setq lyskom-do-when-done (cons next (cdr now)))) (setq lyskom-do-when-done (cons next (cdr now))))
...@@ -2138,7 +2146,7 @@ If optional argument NOCHANGE is non-nil then the list wont be altered." ...@@ -2138,7 +2146,7 @@ If optional argument NOCHANGE is non-nil then the list wont be altered."
(lyskom-insert-before-prompt (lyskom-get-string (lyskom-insert-before-prompt (lyskom-get-string
'error-in-kom-do-when-done)) 'error-in-kom-do-when-done))
(lyskom-beep t) (lyskom-beep t)
(setq lyskom-do-when-done '((kom-edit-options kom-display-time) (setq lyskom-do-when-done '((kom-customize kom-display-time)
. (kom-edit-options kom-display-time))) . (kom-edit-options kom-display-time)))
'kom-display-time))) 'kom-display-time)))
...@@ -2586,7 +2594,8 @@ If MEMBERSHIPs prioriy is 0, it always returns nil." ...@@ -2586,7 +2594,8 @@ If MEMBERSHIPs prioriy is 0, it always returns nil."
(setq quit-flag nil) (setq quit-flag nil)
;; Restore selected buffer and match data. ;; Restore selected buffer and match data.
(store-match-data old-match-data) (store-match-data old-match-data)
(set-buffer lyskom-filter-old-buffer)) (when (buffer-live-p lyskom-filter-old-buffer)
(set-buffer lyskom-filter-old-buffer)))
(sit-for 0))) (sit-for 0)))
......
...@@ -113,7 +113,35 @@ See lyskom-mode for details." ...@@ -113,7 +113,35 @@ See lyskom-mode for details."
(t (t
(setq buffer (generate-new-buffer host)) (setq buffer (generate-new-buffer host))
(setq name (buffer-name buffer)))) (setq name (buffer-name buffer))))
(setq proc (open-network-stream name buffer host port)) (let* ((proxy-host-string
(cond ((stringp kom-www-proxy) kom-www-proxy)
((listp kom-www-proxy)
(or (cdr (lyskom-string-assoc host kom-www-proxy))
(cdr (assq t kom-www-proxy))
nil))
(t nil)))
(proxy-host nil)
(proxy-port nil)
(match (string-match "\\(.*\\):\\([0-9]+\\)"
(or proxy-host-string ""))))
(setq proxy-host (or (and match
(match-string 1 proxy-host-string))
proxy-host-string)
proxy-port (or (and match
(string-to-int
(match-string 2
proxy-host-string)))
80))
(cond (proxy-host
(setq proc (open-network-stream name buffer
proxy-host
proxy-port))
(lyskom-process-send-string
proc
(format "connect %s:%d\r\n\r\n"
host port)))
(t (setq proc (open-network-stream name buffer
host port)))))
(switch-to-buffer buffer) (switch-to-buffer buffer)
(lyskom-mode) ;Clearing lyskom-default... (lyskom-mode) ;Clearing lyskom-default...
(if session-priority (if session-priority
......
No preview for this file type
...@@ -658,6 +658,21 @@ executing. " ...@@ -658,6 +658,21 @@ executing. "
This variable will eventually be replaced with something else." This variable will eventually be replaced with something else."
server) server)
(def-kom-var kom-www-proxy nil
"*Non-nil indicates a WWW proxy to use for the connection.
This is useful behind a firewall if the proxy supports the CONNECT
method.
If this variable is a string, it is assumed to be a proxy
specification for all LysKOM servers. If it is a list, it is assumed
to be a list of pairs, (SERVER . PROXY) where SERVER is the server for
which PROXY, a proxy specification is to be used. The special value t
can be used for SERVER to indicate a default proxy.
A proxy specification has the form \"HOST:PORT\" where HOST is the
host name of the proxy and PORT is the port to connect to. The :PORT
part is optional. If it is not specified, port 80 is assumed.")
(def-kom-var kom-server-aliases (def-kom-var kom-server-aliases
'(("kom.lysator.liu.se" . "LysKOM") '(("kom.lysator.liu.se" . "LysKOM")
("kom.ludd.luth.se" . "LuddKOM") ("kom.ludd.luth.se" . "LuddKOM")
......
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