Commit 76a54e40 authored by David Byers's avatar David Byers
Browse files

Fixed two bugs.

Detailed changes:
> 2004-01-29  David Byers  <byers@lysator.liu.se>
>
> 	* vars.el.in (lyskom-text-buttons): Improved performance of some
> 	regexps in lyskom-text-buttons.
>
> 	* commands1.el (kom-move-text): Prevent moving from a conference
> 	back to the same conference. Doing this deletes the recipient
> 	completely.
>
4a14
> 	(lyskom-text-buttons): Simplified the regexps for URLs.
parent b4bfa57a
2004-01-29 David Byers <byers@lysator.liu.se>
* vars.el.in (lyskom-text-buttons): Improved performance of some
regexps in lyskom-text-buttons.
* commands1.el (kom-move-text): Prevent moving from a conference
back to the same conference. Doing this deletes the recipient
completely.
2004-01-26 David Byers <byers@lysator.liu.se> 2004-01-26 David Byers <byers@lysator.liu.se>
* vars.el.in (lyskom-format-special): Explicitly format plaintext * vars.el.in (lyskom-format-special): Explicitly format plaintext
types. types.
(lyskom-text-buttons): Simplified the regexps for URLs.
* lyskom-rest.el (smiley-region): New function. * lyskom-rest.el (smiley-region): New function.
(smiley-region): Use it. Clean up some of the code. (smiley-region): Use it. Clean up some of the code.
......
...@@ -3737,17 +3737,20 @@ recipient to remove and target the recipient to add to text-stat." ...@@ -3737,17 +3737,20 @@ recipient to remove and target the recipient to add to text-stat."
(target (lyskom-read-conf-stat 'who-to-move-to-q '(all) (target (lyskom-read-conf-stat 'who-to-move-to-q '(all)
nil nil t))) nil nil t)))
(when (and source target) (when (and source target)
(setq move-footnotes (and footnotes (lyskom-j-or-n-p 'move-footnotes-too-q))) (if (eq (conf-stat->conf-no source)
(setq move-attachments (and attachments (lyskom-j-or-n-p 'move-attachments-too-q))) (conf-stat->conf-no target))
(lyskom-insert-before-prompt 'cant-move-from-to-same)
(lyskom-traverse text (append (list (cons text-no text-stat)) (setq move-footnotes (and footnotes (lyskom-j-or-n-p 'move-footnotes-too-q)))
(and move-footnotes footnotes) (setq move-attachments (and attachments (lyskom-j-or-n-p 'move-attachments-too-q)))
(and move-attachments attachments))
(lyskom-format-insert 'moving-name source target (cdr text)) (lyskom-traverse text (append (list (cons text-no text-stat))
(if (memq (conf-stat->conf-no source) (lyskom-text-recipients (cdr text))) (and move-footnotes footnotes)
(lyskom-move-recipient (car text) source target 'RECPT) (and move-attachments attachments))
(lyskom-insert 'move-text-not-recipient)) (lyskom-format-insert 'moving-name source target (cdr text))
)))))))) (if (memq (conf-stat->conf-no source) (lyskom-text-recipients (cdr text)))
(lyskom-move-recipient (car text) source target 'RECPT)
(lyskom-insert 'move-text-not-recipient))
)))))))))
(def-kom-command kom-move-text-tree (text-no) (def-kom-command kom-move-text-tree (text-no)
......
...@@ -443,6 +443,7 @@ and you have finished reading. Please come back later. ...@@ -443,6 +443,7 @@ and you have finished reading. Please come back later.
(text-to-delete-footnote-from . "Remove footnote from which text:") (text-to-delete-footnote-from . "Remove footnote from which text:")
(text-to-add-cross-reference-to . "Add cross reference to which text:") (text-to-add-cross-reference-to . "Add cross reference to which text:")
(text-has-no-recipients-r . "Text %#1n has no recipients\n") (text-has-no-recipients-r . "Text %#1n has no recipients\n")
(cant-move-from-to-same . "Source and target conferences must be different.\n")
(where-on-list-q . "Placement in your list? (0-%#1d) ") (where-on-list-q . "Placement in your list? (0-%#1d) ")
(member-in-conf . "Joining to %#1M%#2?b%[ %#2s%]%[%]...") (member-in-conf . "Joining to %#1M%#2?b%[ %#2s%]%[%]...")
......
...@@ -433,6 +433,7 @@ du har l ...@@ -433,6 +433,7 @@ du har l
(text-to-delete-footnote-from . "Vilket inlgg vill du subtrahera en fotnot frn:") (text-to-delete-footnote-from . "Vilket inlgg vill du subtrahera en fotnot frn:")
(text-to-add-cross-reference-to . "Vilket inlgg vill du addera en referens till:") (text-to-add-cross-reference-to . "Vilket inlgg vill du addera en referens till:")
(text-has-no-recipients-r . "Inlgg %#1n har inga mottagare\n") (text-has-no-recipients-r . "Inlgg %#1n har inga mottagare\n")
(cant-move-from-to-same . "Mtet du flyttar till kan inte vara samma som du flyttar frn.\n")
(where-on-list-q . "Placering p listan? (0-%#1d) ") (where-on-list-q . "Placering p listan? (0-%#1d) ")
(member-in-conf . "Bli medlem i %#1M%#2?b%[ %#2s%]%[%]...") (member-in-conf . "Bli medlem i %#1M%#2?b%[ %#2s%]%[%]...")
......
...@@ -2157,9 +2157,9 @@ conference and person buttons are not expected.") ...@@ -2157,9 +2157,9 @@ conference and person buttons are not expected.")
("\\(file://\\|ftp://\\|gopher://\\|http://\\|https://\\|news:\\|wais://\\|mailto:\\|telnet:\\)[^\t \012\014\"<>|\\]*[^][\t \012\014\"<>|.,!(){}?'`:;]" ("\\(file://\\|ftp://\\|gopher://\\|http://\\|https://\\|news:\\|wais://\\|mailto:\\|telnet:\\)[^\t \012\014\"<>|\\]*[^][\t \012\014\"<>|.,!(){}?'`:;]"
url 0 nil kom-url-face) url 0 nil kom-url-face)
("<URL:\\s-*\\([^>]+\\)\\s-*>" ("<URL:\\([^<>]+\\)>"
pseudo-url 1 1 kom-url-face lyskom-is-url) pseudo-url 1 1 kom-url-face lyskom-is-url)
("<\\s-*\\([^>]+\\)\\s-*>" ("<\\([^<>]+\\)>"
pseudo-url 1 1 kom-url-face lyskom-is-url) pseudo-url 1 1 kom-url-face lyskom-is-url)
;; JySKom enhancements ;; JySKom enhancements
......
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