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

Små bugfixar

Lite smartare fyllning
parent 0513d1f0
Fri Sep 26 11:18:57 1997 David Byers <davby@ida.liu.se>
* lyskom-rest.el (lyskom-fill-message): Bryt inte stycken dr alla
rader brjar med ett ord och ett kolon.
Wed Sep 24 15:32:03 1997 David Byers <davby@ida.liu.se>
* lyskom-rest.el (lyskom-format-prompt): Anvnd eq, inte = fr att
jmfra tecken.
* flags.el (kom-edit-options-send): Fixade buggen som gjorde att
defaultvrdena sparades.
Tue Sep 23 16:41:30 1997 David Byers <davby@ida.liu.se>
* vars.el.in (lyskom-face-schemes): Nya frger.
1997-09-23 David Byers <davby@sen2.ida.liu.se>
* commands2.el (lyskom-help): Fungera i Gnu Emacs.
1997-09-22 David Byers <davby@ida.liu.se>
* commands2.el (lyskom-next-kom): Ny funktion.
......
......@@ -973,7 +973,9 @@ Format is 23:29 if the text is written today. Otherwise 04-01."
(lambda (arg)
(format "%s - %s"
(if (fboundp 'key-description)
(key-description (car arg))
(if (not (vectorp (car arg)))
(key-description (vector (car arg)))
(key-description (car arg)))
(cond ((symbolp (car arg))
(format "%s" (car arg)))
((characterp (car arg))
......
......@@ -1628,7 +1628,6 @@ On since %#8s%#9s")
(if lyskom-en-customize-map
nil
(setq lyskom-en-customize-map (make-sparse-keymap))
(set-keymap-parent lyskom-en-customize-map global-map)
(define-key lyskom-en-customize-map "\t" 'widget-forward)
(define-key lyskom-en-customize-map "\M-\t" 'widget-backward)
(define-key lyskom-en-customize-map "\C-m" 'widget-button-press)
......
......@@ -127,53 +127,56 @@
;lets do it.
;lyskom-global-variables is a list of variables in the common block.
;lyskom-elisp-variables is a list of varibles in the elisp block.
(let* ((buf lyskom-buffer)
(optbuf (current-buffer))
(let* ((optbuf (current-buffer))
(print-readably t)
(common-block
(concat
(mapconcat (function
(lambda (var)
(lyskom-format-objects
(substring (symbol-name var) 4)
(if (symbol-value var) "1" "0"))))
lyskom-global-boolean-variables
"\n")
"\n"
(mapconcat (function
(lambda (var)
(lyskom-format-objects
(substring (symbol-name var) 4)
(prin1-to-string (symbol-value var)))))
lyskom-global-non-boolean-variables
"\n")
))
(elisp-block
(mapconcat (function
(lambda (var)
(lyskom-format-objects (symbol-name var)
(prin1-to-string
(symbol-value var)))))
lyskom-elisp-variables
"\n")))
(set-buffer buf)
(lyskom-start-of-command (lyskom-get-string 'saving-settings) t)
(lyskom-insert-string 'hang-on)
(initiate-create-text 'options 'lyskom-edit-options-send
(common-block nil)
(elisp-block nil))
(save-excursion
(set-buffer lyskom-buffer)
(setq
common-block
(concat
(mapconcat (function
(lambda (var)
(lyskom-format-objects
(substring (symbol-name var) 4)
(if (symbol-value var) "1" "0"))))
lyskom-global-boolean-variables
"\n")
"\n"
(mapconcat (function
(lambda (var)
(lyskom-format-objects
(substring (symbol-name var) 4)
(prin1-to-string (symbol-value var)))))
lyskom-global-non-boolean-variables
"\n")
)
elisp-block
(mapconcat (function
(lambda (var)
(lyskom-format-objects (symbol-name var)
(prin1-to-string
(symbol-value var)))))
lyskom-elisp-variables
"\n"))
(lyskom-start-of-command (lyskom-get-string 'saving-settings) t)
(lyskom-insert-string 'hang-on)
(initiate-create-text 'options 'lyskom-edit-options-send
;;; This is a cludge awaiting prot-B
(apply 'lyskom-format-objects
(apply 'lyskom-format-objects
"common"
"elisp"
(mapcar
(function car)
lyskom-other-clients-user-areas))
common-block
elisp-block
(mapcar (function cdr)
lyskom-other-clients-user-areas))
; (concat common-block "----------\n" elisp-block)
(lyskom-create-misc-list) optbuf)))
(apply 'lyskom-format-objects
(apply 'lyskom-format-objects
"common"
"elisp"
(mapcar
(function car)
lyskom-other-clients-user-areas))
common-block
elisp-block
(mapcar (function cdr)
lyskom-other-clients-user-areas))
; (concat common-block "----------\n" elisp-block)
(lyskom-create-misc-list) optbuf))))
(t
(let ((optbuf (current-buffer)))
(set-buffer lyskom-buffer)
......
......@@ -1503,6 +1503,11 @@ in lyskom-messages."
t)
(t 'maybe)))
(defsubst lyskom-fill-message-colon-line ()
"Return non-nil if the current line starts with a colon-like thing."
(looking-at "\\S-+\\s-*:"))
(defun lyskom-fill-region (start end &optional justify nosqueeze to-eop)
"Fill a region of text, compensating for bugs in Emacs."
......@@ -1534,6 +1539,7 @@ in lyskom-messages."
(wrap-paragraph 'maybe)
(length-difference nil)
(constant-length nil)
(all-lines-colons t)
(current-line-length nil)
(last-line-length nil)
(paragraph-length 0)
......@@ -1568,7 +1574,6 @@ in lyskom-messages."
length-difference)
(setq constant-length 'maybe-not))))
(cond
;;
......@@ -1578,16 +1583,18 @@ in lyskom-messages."
((looking-at "^\\s-*$")
(when (and in-paragraph
(not all-lines-colons)
(eq wrap-paragraph t)
(or (null constant-length)
(and (eq 0 length-difference)
(< paragraph-length lyskom-minimum-brick-size))
(and (not (eq 0 length-difference))
(< paragraph-length lyskom-minimum-triagle-size))))
(lyskom-fill-region start (match-beginning 0) nil t)
(lyskom-fill-region start (1- (match-beginning 0)) nil t)
(lyskom-signal-reformatted-text 'reformat-filled))
(setq start (match-end 0)
in-paragraph nil
all-lines-colons t
wrap-paragraph 'maybe))
;;
......@@ -1611,6 +1618,7 @@ in lyskom-messages."
have-indented-paragraphs))
(setq have-indented-paragraphs t)
(when (and (eq wrap-paragraph t)
(not all-lines-colons)
(or (and (eq 0 length-difference)
(< paragraph-length lyskom-minimum-brick-size))
(and (not (eq 0 length-difference))
......@@ -1624,6 +1632,7 @@ in lyskom-messages."
constant-length t
length-difference nil
last-line-length nil
all-lines-colons (lyskom-fill-message-colon-line)
single-line-regexp "\\(\\S-\\)"
fill-prefix nil
start (match-beginning 0)
......@@ -1633,6 +1642,7 @@ in lyskom-messages."
((and in-paragraph
(looking-at "^\\s-*\\(-+\\|\\++\\)\\s-*\\S-"))
(when (and (eq wrap-paragraph t)
(not all-lines-colons)
(or (and (eq 0 length-difference)
(< paragraph-length lyskom-minimum-brick-size))
(and (not (eq 0 length-difference))
......@@ -1645,6 +1655,7 @@ in lyskom-messages."
paragraph-length 0
constant-length t
length-difference nil
all-lines-colons (lyskom-fill-message-colon-line)
last-line-length nil
single-line-regexp "\\(\\S-\\)"
fill-prefix nil
......@@ -1669,6 +1680,7 @@ in lyskom-messages."
constant-length 0
length-difference nil
last-line-length nil
all-lines-colons (lyskom-fill-message-colon-line)
start (match-beginning 0)
fill-prefix (match-string 1)
single-line-regexp (concat (match-string 1) "\\(\\S-\\)")
......@@ -1684,6 +1696,7 @@ in lyskom-messages."
(looking-at "\\s-*\\(\\S-\\)"))
(setq in-paragraph t
paragraph-length 0
all-lines-colons (lyskom-fill-message-colon-line)
constant-length t
length-difference nil
last-line-length nil
......@@ -1714,7 +1727,17 @@ in lyskom-messages."
((and in-paragraph
wrap-paragraph
(> current-line-length fill-column))
(setq wrap-paragraph t)))
(setq wrap-paragraph t))
)
;;
;; Check if the line starts with Foo:
;;
(when (and in-paragraph
all-lines-colons
(not (lyskom-fill-message-colon-line)))
(setq all-lines-colons nil))
;;
;; Certain things are guaranteed to disqualify the
......@@ -1751,6 +1774,7 @@ in lyskom-messages."
;;
(when (and in-paragraph
(not all-lines-colons)
(eq wrap-paragraph t)
(or (and (eq 0 length-difference)
(< paragraph-length lyskom-minimum-brick-size))
......@@ -2044,28 +2068,28 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing."
(setq start (match-end 0))
(setq result
(cons
(cond ((= format-letter ?\[) (if kom-ansaphone-on "[" ""))
((= format-letter ?\]) (if kom-ansaphone-on "]" ""))
((= format-letter ?c) command)
((= format-letter ?w)
(cond ((eq format-letter ?\[) (if kom-ansaphone-on "[" ""))
((eq format-letter ?\]) (if kom-ansaphone-on "]" ""))
((eq format-letter ?c) command)
((eq format-letter ?w)
(or (conf-stat->name
(cache-get-conf-stat lyskom-current-conf))
(lyskom-format 'conference-no
lyskom-current-conf)))
((= format-letter ?S) lyskom-server-name)
((= format-letter ?s)
((eq format-letter ?S) lyskom-server-name)
((eq format-letter ?s)
(or (cdr (assoc lyskom-server-name
kom-server-aliases))
lyskom-server-name))
((= format-letter ?p)
((eq format-letter ?p)
(or (conf-stat->name
(cache-get-conf-stat lyskom-pers-no))
(lyskom-format 'person-no
lyskom-pers-no)))
((= format-letter ?#) (number-to-string
((eq format-letter ?#) (number-to-string
lyskom-session-no))
((= format-letter ?m)
((eq format-letter ?m)
(cond ((< messages 1)
"")
((= messages 1)
......@@ -2075,8 +2099,8 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing."
(format (lyskom-get-string
'prompt-several-messages)
messages))))
((= format-letter ?%) "%")
((= format-letter ?\ )
((eq format-letter ?%) "%")
((eq format-letter ?\ )
'SPC))
result)))
(progn
......
......@@ -938,7 +938,6 @@ customize buffer but do not save them to the server."
':args '(lyskom-name))
;;;
;;; The Command Widget
;;;
......@@ -1004,6 +1003,7 @@ customize buffer but do not save them to the server."
':args '(lyskom-command))
;;;
;;; A new String widget
;;;
......
No preview for this file type
......@@ -1840,16 +1840,16 @@ the value of kom-tell-phrases for fun.")
(kom-presence-face italic "dim gray" nil)
(kom-first-line-face default nil nil))
(highlight
(kom-active-face default nil nil)
(kom-url-face default nil "LemonChiffon1")
(kom-me-face default nil "thistle")
(kom-highlight-face highlight nil nil)
(kom-text-face default nil nil)
(kom-text-no-face default nil nil)
(kom-friends-face default nil "misty rose")
(kom-subject-face default nil nil)
(kom-presence-face italic "dim gray" nil)
(kom-first-line-face default nil "lavender")))
(kom-active-face default nil "aliceblue")
(kom-url-face default nil "yellow")
(kom-me-face bold "darkblue" "thistle")
(kom-highlight-face highlight nil nil)
(kom-text-face default nil nil)
(kom-text-no-face default nil nil)
(kom-friends-face default "darkblue" "thistle")
(kom-subject-face default nil nil)
(kom-presence-face italic "dim gray" nil)
(kom-first-line-face default nil "lavender")))
"Face schemes for LysKOM.
This variable is an association list that defines the face and color
......
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