Commit 255a8cce authored by David Byers's avatar David Byers
Browse files

Synkning inför release av 0.46-BETA-J

parent 19bd96b7
2000-05-31 David Byers <davby@sen2.ida.liu.se>
* Release av 0.46-BETA-J
2000-05-31 David Byers <davby@ida.liu.se>
* edit-text.el (kom-edit-insert-commented): Don't use 62 instead
of ">" or ?>. Please.
(kom-edit-insert-commented): Don't send the default prefix to
lyskom-edit-insert-commented. nil now means default.
(lyskom-edit-insert-commented): Prefix nil means use default prefix.
New calling conventions for lyskom-view-text-hook
* view-text.el (lyskom-filter-signature-hook): Use
lyskom-view-text-text and lyskom-view-text-text-stat
* vars.el.in (lyskom-view-text-hook): Fixed docstring.
* view-text.el (lyskom-view-text): Set lyskom-view-text-text and
lyskom-view-text-text-stat.
Scrolling problems
* mship-edit.el (lp--scroll-advice): Fixed bug that caused most of
the code to run in any buffer.
2000-05-30 David Byers <davby@ida.liu.se> 2000-05-30 David Byers <davby@ida.liu.se>
* command.el (lyskom-fix-interactive-decl): Bind * command.el (lyskom-fix-interactive-decl): Bind
......
...@@ -1010,8 +1010,7 @@ given, prepend each line with your commenting prefix (or '>')." ...@@ -1010,8 +1010,7 @@ given, prepend each line with your commenting prefix (or '>')."
(lyskom-edit-get-commented (lyskom-edit-get-commented
'lyskom-edit-insert-commented 'lyskom-edit-insert-commented
(list (cond ((and arg (listp arg)) "") (list (cond ((and arg (listp arg)) "")
(t (or (lyskom-default-value 'kom-cite-string) (t nil)))))
62)))))) ; '>'
(defun kom-edit-insert-buglist () (defun kom-edit-insert-buglist ()
...@@ -1039,12 +1038,8 @@ given, prepend each line with your commenting prefix (or '>')." ...@@ -1039,12 +1038,8 @@ given, prepend each line with your commenting prefix (or '>')."
(window (selected-window))) (window (selected-window)))
(set-buffer lyskom-buffer) (set-buffer lyskom-buffer)
(lyskom-collect 'edit) (lyskom-collect 'edit)
(initiate-get-text 'edit (initiate-get-text 'edit nil no)
nil (initiate-get-text-stat 'edit nil no)
no)
(initiate-get-text-stat 'edit
nil
no)
(lyskom-use 'edit 'lyskom-edit-insert-commented buffer window) (lyskom-use 'edit 'lyskom-edit-insert-commented buffer window)
(set-buffer buffer) (set-buffer buffer)
(sit-for 0))) (sit-for 0)))
...@@ -1724,12 +1719,11 @@ the with-output-to-temp-buffer command is issued to make them both apear." ...@@ -1724,12 +1719,11 @@ the with-output-to-temp-buffer command is issued to make them both apear."
(defun lyskom-edit-insert-commented (text text-stat editing-buffer window &optional prefix) (defun lyskom-edit-insert-commented (text text-stat editing-buffer window &optional prefix)
"Handles the TEXT and TEXT-STAT from the return of the call of the text. "Handles the TEXT and TEXT-STAT from the return of the call of the text.
When given a PREFIX string, that is prepended to each inserted line." When given a PREFIX string, that is prepended to each inserted line.
If PREFIX is nil, use the default prefix (kom-cite-string or \">\"."
(if (and text text-stat) (if (and text text-stat)
(let ((str (text->decoded-text-mass text text-stat)) (let ((str (text->decoded-text-mass text text-stat))
(prefix (or prefix ; FIXME: kludge that should be removed; it's here just (prefix (or prefix (lyskom-default-value 'kom-cite-string) ">")))
(lyskom-default-value 'kom-cite-string); because I didn't see
62))) ; how to patch kom-edit-insert-text to behave. :-/ /jhs
(set-buffer editing-buffer) (set-buffer editing-buffer)
(and (not (bolp)) (and (not (bolp))
(insert "\n")) (insert "\n"))
......
...@@ -1568,7 +1568,7 @@ You must become an active member of the conference to enter it.\n") ...@@ -1568,7 +1568,7 @@ You must become an active member of the conference to enter it.\n")
(kom-keep-alive . "Keep connection alive") (kom-keep-alive . "Keep connection alive")
(kom-stop-keep-alive . "Stop keeping connection alive") (kom-stop-keep-alive . "Stop keeping connection alive")
(kom-is-person-member-of-conference . "Check (if Person is a) member (of Conference)") (kom-is-person-member-of-conference . "Check (if person is a) member (of conference)")
)) ))
(lyskom-language-var lyskom-language-codes en (lyskom-language-var lyskom-language-codes en
......
...@@ -1268,7 +1268,7 @@ entry with an adjacent priority." ...@@ -1268,7 +1268,7 @@ entry with an adjacent priority."
(let ((cur (current-column))) (let ((cur (current-column)))
(funcall fn) (funcall fn)
(when (and (boundp 'lyskom-buffer-category) (when (and (boundp 'lyskom-buffer-category)
lyskom-buffer-category 'prioritize) (eq lyskom-buffer-category 'prioritize))
(let ((last-entry (lp--get-last-visible-entry )) (let ((last-entry (lp--get-last-visible-entry ))
(first-entry (lp--next-visible-entry 0))) (first-entry (lp--next-visible-entry 0)))
(cond ((null last-entry) (cond ((null last-entry)
......
...@@ -1576,7 +1576,7 @@ Du m ...@@ -1576,7 +1576,7 @@ Du m
(kom-keep-alive . "Hll frbindelsen aktiv") (kom-keep-alive . "Hll frbindelsen aktiv")
(kom-stop-keep-alive . "Avbryt hll frbindelsen aktiv") (kom-stop-keep-alive . "Avbryt hll frbindelsen aktiv")
(kom-is-person-member-of-conference . "Kontrollera (om Person r) medlem (i Mte)") (kom-is-person-member-of-conference . "Kontrollera (om person r) medlem (i mte)")
)) ))
(lyskom-language-var lyskom-language-codes sv (lyskom-language-var lyskom-language-codes sv
......
...@@ -427,8 +427,9 @@ long as there are sessions with unread texts. ...@@ -427,8 +427,9 @@ long as there are sessions with unread texts.
(def-kom-var lyskom-view-text-hook nil (def-kom-var lyskom-view-text-hook nil
"*Hook that is called before a text is shown. When the hooks is "*Hook that is called before a text is shown. When the hooks is
called, text is bound to the text mass of the text and text-stat to called, lyskom-view-text-text is bound to the text mass of the
the text-stat of the text to be shown.") text and lyskom-view-text-text-stat to the text-stat of the text
to be shown.")
(def-kom-var lyskom-send-message-hook '(lyskom-send-message-trim-newlines) (def-kom-var lyskom-send-message-hook '(lyskom-send-message-trim-newlines)
......
...@@ -38,6 +38,10 @@ ...@@ -38,6 +38,10 @@
"$Id$\n")) "$Id$\n"))
(defvar lyskom-view-text-text)
(defvar lyskom-view-text-text-stat)
(defun lyskom-view-text (text-no &optional mark-as-read (defun lyskom-view-text (text-no &optional mark-as-read
follow-comments conf-stat priority follow-comments conf-stat priority
build-review-tree filter-active build-review-tree filter-active
...@@ -85,6 +89,8 @@ Note that this function must not be called asynchronously." ...@@ -85,6 +89,8 @@ Note that this function must not be called asynchronously."
(setq todo 'next-text)) (setq todo 'next-text))
(blocking-do-multiple ((text-stat (get-text-stat text-no)) (blocking-do-multiple ((text-stat (get-text-stat text-no))
(text (get-text text-no))) (text (get-text text-no)))
(setq lyskom-view-text-text text
lyskom-view-text-text-stat text-stat)
(if (and text-stat text) (if (and text-stat text)
(progn (progn
(run-hooks 'lyskom-view-text-hook) (run-hooks 'lyskom-view-text-hook)
...@@ -348,11 +354,11 @@ Note that this function must not be called asynchronously." ...@@ -348,11 +354,11 @@ Note that this function must not be called asynchronously."
"Filter out the signature of imported mail messages. Most useful "Filter out the signature of imported mail messages. Most useful
when put in your `lyskom-view-text-hook'." when put in your `lyskom-view-text-hook'."
(unless (eq 'kom-review-noconversion lyskom-current-command) (unless (eq 'kom-review-noconversion lyskom-current-command)
(when (lyskom-text-is-mail-p text-stat) (when (lyskom-text-is-mail-p lyskom-view-text-text-stat)
(let* ((body (text->text-mass text)) (let* ((body (text->text-mass lyskom-view-text-text))
(sign (string-match "^-- $" body))) (sign (string-match "^-- $" body)))
(when sign (when sign
(set-text->text-mass text (substring body 0 sign)) (set-text->text-mass lyskom-view-text-text (substring body 0 sign))
(lyskom-signal-reformatted-text 'reformat-signature)))))) (lyskom-signal-reformatted-text 'reformat-signature))))))
;(add-hook 'lyskom-view-text-hook 'lyskom-filter-signature-hook) ;(add-hook 'lyskom-view-text-hook 'lyskom-filter-signature-hook)
......
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