Commit abb27d10 authored by Johan Sundström's avatar Johan Sundström
Browse files

(Your) marks are now shown as an intetger when reading a text.

parent 81235303
2000-05-29 Johan Sundström <jhs@lysator.liu.se>
* view-text.el (lyskom-view-text): Marks now show themselves,
always. Perhaps ought not to when kom-default-mark is set, and
this really ought to be done as a %m or something flag to
lyskom-format with context menus to change or remove a mark, but
that will have to wait for the time being.
* swedish-strings.el, english-strings.el (lyskom-message): Altered
the strings marked-by-you and marked-by-you-and-others somewhat.
2000-05-28 Johan Sundström <jhs@lysator.liu.se> 2000-05-28 Johan Sundström <jhs@lysator.liu.se>
* commands2.el (kom-list-news): Rehacked from scratch. Now * commands2.el (kom-list-news): Rehacked from scratch. Now
......
...@@ -787,8 +787,8 @@ Help: \\[describe-mode] ---") ...@@ -787,8 +787,8 @@ Help: \\[describe-mode] ---")
(line . " /1 line/ ") (line . " /1 line/ ")
(lines ." /%#1d lines/ ") (lines ." /%#1d lines/ ")
(marked-by-you . "Marked by you.\n") (marked-by-you . "Marked by you (%#1d).\n")
(marked-by-you-and-others . "Marked by you and %#1?d%[someone else%]%[%#1d others%].\n") (marked-by-you-and-others . "Marked by you (%#2d) and %#1?d%[someone else%]%[%#1d others%].\n")
(marked-by-several . "Marked by %#1d user%#1?d%[%]%[s%].\n") (marked-by-several . "Marked by %#1d user%#1?d%[%]%[s%].\n")
(time-yyyy-mm-dd-hh-mm . "%4#1d-%02#2d-%02#3d %02#4d:%02#5d") (time-yyyy-mm-dd-hh-mm . "%4#1d-%02#2d-%02#3d %02#4d:%02#5d")
......
...@@ -793,8 +793,8 @@ Annat se \\[describe-mode] ---") ...@@ -793,8 +793,8 @@ Annat se \\[describe-mode] ---")
(line . " /1 rad/ ") (line . " /1 rad/ ")
(lines ." /%#1d rader/ ") (lines ." /%#1d rader/ ")
(marked-by-you . "Markerad av dig.\n") (marked-by-you . "Markerad av dig (%#1d).\n")
(marked-by-you-and-others . "Markerad av dig och %#1?d%[ngon annan%]%[%#1d andra%].\n") (marked-by-you-and-others . "Markerad av dig (%#2d) och %#1?d%[ngon annan%]%[%#1d andra%].\n")
(marked-by-several . "Markerad av %#1d person%#1?d%[%]%[er%].\n") (marked-by-several . "Markerad av %#1d person%#1?d%[%]%[er%].\n")
(time-yyyy-mm-dd-hh-mm . "%4#1d-%02#2d-%02#3d %02#4d:%02#5d") (time-yyyy-mm-dd-hh-mm . "%4#1d-%02#2d-%02#3d %02#4d:%02#5d")
......
...@@ -269,15 +269,18 @@ Note that this function must not be called asynchronously." ...@@ -269,15 +269,18 @@ Note that this function must not be called asynchronously."
(let ((num-marks (text-stat->no-of-marks text-stat)) (let ((num-marks (text-stat->no-of-marks text-stat))
(is-marked-by-me (cache-text-is-marked (is-marked-by-me (cache-text-is-marked
(text-stat->text-no text-stat)))) (text-stat->text-no text-stat))))
(if (> num-marks 0) (when (> num-marks 0)
(lyskom-insert (if is-marked-by-me
(if is-marked-by-me (if (= num-marks 1)
(if (= num-marks 1) (lyskom-format-insert 'marked-by-you
(lyskom-get-string 'marked-by-you) (mark->mark-type
(lyskom-format 'marked-by-you-and-others is-marked-by-me))
(1- num-marks))) (lyskom-format-insert 'marked-by-you-and-others
(lyskom-format 'marked-by-several num-marks))))) (1- num-marks)
(mark->mark-type
is-marked-by-me)))
(lyskom-format-insert 'marked-by-several num-marks))))
(lyskom-print-text text-stat text (lyskom-print-text text-stat text
mark-as-read text-no flat-review)) mark-as-read text-no flat-review))
...@@ -329,8 +332,8 @@ Note that this function must not be called asynchronously." ...@@ -329,8 +332,8 @@ Note that this function must not be called asynchronously."
(setq aux-items (cdr aux-items)))) (setq aux-items (cdr aux-items))))
))) )))
todo)) todo))
(defun lyskom-follow-comments (text-stat conf-stat (defun lyskom-follow-comments (text-stat conf-stat
......
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