Commit 7e85cbe9 authored by David Byers's avatar David Byers
Browse files

Update settings buffer with new settings.

parent 8d3be2e6
2007-06-24 <David Byers@GULAG> 2007-06-24 <David Byers@GULAG>
More customization:
* lyskom-rest.el (lyskom-format-html): Use lyskom-indirect-assq to
look stuff up in kom-format-html-authors.
Fix settings buffer:
* option-edit.el (lyskom-custom-variables): Updated definitions
for kom-highlight-conferences, kom-presence-messages-in-buffer,
kom-presence-messages-in-echo-area. Updated widget definitions so
we don't get newlines in unexpected places (and get then where we
really want them). Removed indent from most lists.
Fix bug 1143: Fix bug 1143:
* review.el (lyskom-last-review-filter): New variable. * review.el (lyskom-last-review-filter): New variable.
(kom-review-all-roots): New command. (kom-review-all-roots): New command.
......
...@@ -3029,8 +3029,10 @@ Change privileges for %#1P (%#1p)...") ...@@ -3029,8 +3029,10 @@ Change privileges for %#1P (%#1p)...")
(define-key lyskom-en-customize-map (kbd "C-j") 'widget-button-press) (define-key lyskom-en-customize-map (kbd "C-j") 'widget-button-press)
(define-key lyskom-en-customize-map (kbd "<RET>") 'widget-button-press) (define-key lyskom-en-customize-map (kbd "<RET>") 'widget-button-press)
(define-key lyskom-en-customize-map (kbd "<LFD>") 'widget-button-press) (define-key lyskom-en-customize-map (kbd "<LFD>") 'widget-button-press)
(define-key lyskom-en-customize-map (kbd (lyskom-keys 'button1up)) 'kom-mouse-null)
(define-key lyskom-en-customize-map (kbd (lyskom-keys 'button2up)) 'kom-mouse-null) (define-key lyskom-en-customize-map (kbd (lyskom-keys 'button2up)) 'kom-mouse-null)
(define-key lyskom-en-customize-map (kbd (lyskom-keys 'button3up)) 'kom-mouse-null) (define-key lyskom-en-customize-map (kbd (lyskom-keys 'button3up)) 'kom-mouse-null)
(define-key lyskom-en-customize-map (kbd (lyskom-keys 'button1)) 'widget-button-click)
(define-key lyskom-en-customize-map (kbd (lyskom-keys 'button2)) 'widget-button-click) (define-key lyskom-en-customize-map (kbd (lyskom-keys 'button2)) 'widget-button-click)
(define-key lyskom-en-customize-map (kbd (lyskom-keys 'button3)) 'lyskom-widget-click) (define-key lyskom-en-customize-map (kbd (lyskom-keys 'button3)) 'lyskom-widget-click)
(define-key lyskom-en-customize-map (kbd "C-c C-c") 'lyskom-customize-save-and-quit) (define-key lyskom-en-customize-map (kbd "C-c C-c") 'lyskom-customize-save-and-quit)
...@@ -3152,7 +3154,7 @@ Select whether to execute command or keyboard macro.") ...@@ -3152,7 +3154,7 @@ Select whether to execute command or keyboard macro.")
(command . "Command") (command . "Command")
(command-list . "Command list") (command-list . "Command list")
(some-persons . "For some persons") (some-persons . "For some persons:")
(name . "Name") (name . "Name")
(page-none . "Never ") (page-none . "Never ")
...@@ -3276,6 +3278,18 @@ Select whether to execute command or keyboard macro.") ...@@ -3276,6 +3278,18 @@ Select whether to execute command or keyboard macro.")
(extended-statistics-info . "Full server statistics") (extended-statistics-info . "Full server statistics")
(extended-all-other-info . "Other information") (extended-all-other-info . "Other information")
(show-presence . "Show presence messages")
(conflist . "Conference/person list")
(pers-list-1 . "Conference/person list 1")
(pers-list-2 . "Conference/person list 2")
(pers-list-3 . "Conference/person list 3")
(pers-list-4 . "Conference/person list 4")
(other-list . "Other list")
(always-show-presence . "Show all presence messages")
(never-show-presence . "Show no presence messages")
(obsolete-setting . "Obsolete setting")
(detailed-setting . "Detailed setting")
;; ;;
;; Misc doc strings ;; Misc doc strings
;; ;;
...@@ -4520,10 +4534,10 @@ up menus.") ...@@ -4520,10 +4534,10 @@ up menus.")
(kom-filter-outgoing-messages-tag . "Show automatic messages:") (kom-filter-outgoing-messages-tag . "Show automatic messages:")
(kom-friends-tag . "Friends and other special people:") (kom-friends-tag . "Friends and other special people:")
(kom-morons-tag . "Morons and other \"special\" people:") (kom-morons-tag . "Morons and other \"special\" people:")
(kom-person-list-1-tag . "Generlic list of persons (1):") (kom-person-list-1-tag . "Generlic list of conferences/persons (1):")
(kom-person-list-2-tag . "Generlic list of persons (2):") (kom-person-list-2-tag . "Generlic list of conferences/persons (2):")
(kom-person-list-3-tag . "Generlic list of persons (3):") (kom-person-list-3-tag . "Generlic list of conferences/persons (3):")
(kom-person-list-4-tag . "Generlic list of persons (4):") (kom-person-list-4-tag . "Generlic list of conferences/persons (4):")
(kom-url-viewer-preferences-tag . "Open URLs using the following program:") (kom-url-viewer-preferences-tag . "Open URLs using the following program:")
(kom-windows-browser-command-tag . "Command to start a web browser on Windows:") (kom-windows-browser-command-tag . "Command to start a web browser on Windows:")
(kom-mosaic-command-tag . "Command to start NCSA Mosaic:") (kom-mosaic-command-tag . "Command to start NCSA Mosaic:")
......
...@@ -2427,9 +2427,10 @@ in lyskom-messages." ...@@ -2427,9 +2427,10 @@ in lyskom-messages."
(defun lyskom-format-html (text text-stat package function) (defun lyskom-format-html (text text-stat package function)
;; Find settings for this author ;; Find settings for this author
(let ((author-setting (and text-stat (or (assq (text-stat->author text-stat) (let ((author-setting (and text-stat
kom-format-html-authors) (lyskom-indirect-assq (text-stat->author
(assq t kom-format-html-authors))))) text-stat)
kom-format-html-authors))))
(when (and (cdr author-setting) (when (and (cdr author-setting)
(condition-case e (progn (require package) t) (error nil))) (condition-case e (progn (require package) t) (error nil)))
(add-text-properties 0 (length text) `(special-insert ,function) text) (add-text-properties 0 (length text) `(special-insert ,function) text)
......
This diff is collapsed.
...@@ -3181,8 +3181,10 @@ Nuvarande r ...@@ -3181,8 +3181,10 @@ Nuvarande r
(define-key lyskom-sv-customize-map (kbd "C-j") 'widget-button-press) (define-key lyskom-sv-customize-map (kbd "C-j") 'widget-button-press)
(define-key lyskom-sv-customize-map (kbd "<RET>") 'widget-button-press) (define-key lyskom-sv-customize-map (kbd "<RET>") 'widget-button-press)
(define-key lyskom-sv-customize-map (kbd "<LFD>") 'widget-button-press) (define-key lyskom-sv-customize-map (kbd "<LFD>") 'widget-button-press)
(define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button1)) 'widget-button-click)
(define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button2)) 'widget-button-click) (define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button2)) 'widget-button-click)
(define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button3)) 'lyskom-widget-click) (define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button3)) 'lyskom-widget-click)
(define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button1up)) 'kom-mouse-null)
(define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button2up)) 'kom-mouse-null) (define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button2up)) 'kom-mouse-null)
(define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button3up)) 'kom-mouse-null) (define-key lyskom-sv-customize-map (kbd (lyskom-keys 'button3up)) 'kom-mouse-null)
(define-key lyskom-sv-customize-map (kbd "C-c C-c") 'lyskom-customize-save-and-quit) (define-key lyskom-sv-customize-map (kbd "C-c C-c") 'lyskom-customize-save-and-quit)
...@@ -3303,7 +3305,7 @@ Nuvarande r ...@@ -3303,7 +3305,7 @@ Nuvarande r
(command . "Kommando") (command . "Kommando")
(command-list . "Kommandolista") (command-list . "Kommandolista")
(some-persons . "Fr vissa personer") (some-persons . "Fr vissa personer:")
(name . "Namn") (name . "Namn")
(page-none . "Aldrig ") (page-none . "Aldrig ")
...@@ -3379,7 +3381,7 @@ Nuvarande r ...@@ -3379,7 +3381,7 @@ Nuvarande r
(format-html . "Formattera HTML:") (format-html . "Formattera HTML:")
(url-transform-regexp . "Frn (regexp):") (url-transform-regexp . "Frn (regexp):")
(url-transform-newtext . " Till:") (url-transform-newtext . "Till:")
(default-namedays . "Namnsdagar fr aktuellt sprk") (default-namedays . "Namnsdagar fr aktuellt sprk")
(specific-namedays . "Specifik namnlngd") (specific-namedays . "Specifik namnlngd")
...@@ -3428,6 +3430,18 @@ Nuvarande r ...@@ -3428,6 +3430,18 @@ Nuvarande r
(extended-statistics-info . "Fullstndig serverstatistik") (extended-statistics-info . "Fullstndig serverstatistik")
(extended-all-other-info . "Annan information") (extended-all-other-info . "Annan information")
(show-presence . "Visa nrvaromeddelanden")
(conflist . "Mtes/Personlista")
(pers-list-1 . "Mtes/personlista 1")
(pers-list-2 . "Mtes/personlista 2")
(pers-list-3 . "Mtes/personlista 3")
(pers-list-4 . "Mtes/personlista 4")
(other-list . "Annan lista")
(always-show-presence . "Visa alla nrvaromeddelanden")
(never-show-presence . "Visa inga nrvaromeddelanden")
(obsolete-setting . "Frldrad instllning")
(detailed-setting . "Detaljerad instllning")
;; ;;
;; Misc doc strings ;; Misc doc strings
;; ;;
...@@ -4676,10 +4690,10 @@ ta fram menyer.") ...@@ -4676,10 +4690,10 @@ ta fram menyer.")
(kom-filter-outgoing-messages-tag . "Visa automatiska meddelanden:") (kom-filter-outgoing-messages-tag . "Visa automatiska meddelanden:")
(kom-friends-tag . "Vnner och bekanta:") (kom-friends-tag . "Vnner och bekanta:")
(kom-morons-tag . "Idioter och knppskallar:") (kom-morons-tag . "Idioter och knppskallar:")
(kom-person-list-1-tag . "Personlista (1):") (kom-person-list-1-tag . "Mtes/personlista (1):")
(kom-person-list-2-tag . "Personlista (1):") (kom-person-list-2-tag . "Mtes/personlista (2):")
(kom-person-list-3-tag . "Personlista (1):") (kom-person-list-3-tag . "Mtes/personlista (3):")
(kom-person-list-4-tag . "Personlista (1):") (kom-person-list-4-tag . "Mtes/personlista (4):")
(kom-url-viewer-preferences-tag . "ppna URLer med fljande program:") (kom-url-viewer-preferences-tag . "ppna URLer med fljande program:")
(kom-windows-browser-command-tag . "Kommando fr att starta en WWW-lsare i Windows:") (kom-windows-browser-command-tag . "Kommando fr att starta en WWW-lsare i Windows:")
(kom-mosaic-command-tag . "Kommando fr att starta NCSA Mosaic:") (kom-mosaic-command-tag . "Kommando fr att starta NCSA Mosaic:")
......
...@@ -1481,7 +1481,7 @@ rules are as follows: ...@@ -1481,7 +1481,7 @@ rules are as follows:
this variable to a list of person numbers). this variable to a list of person numbers).
`(t . VAL)' Matches with value VAL if no other match is `(t . VAL)' Matches with value VAL if no other match is
found. found (i.e. sets the default value).
`(FN . VAL)' Matches with value VAL if FN is a function that `(FN . VAL)' Matches with value VAL if FN is a function that
returns non-nil when called with the person returns non-nil when called with the person
...@@ -4556,10 +4556,46 @@ Values other than `t' and `nil' are reserved for future use." ...@@ -4556,10 +4556,46 @@ Values other than `t' and `nil' are reserved for future use."
(def-kom-var kom-format-html-authors '((t . t)) (def-kom-var kom-format-html-authors '((t . t))
"**Determines from which authors we accept HTML. "**Determines from which authors we accept HTML.
Each element of this list is a pair \(`PERS' . `VAL'), where `PERS' is a If non-nil, LysKOM will attempt to format texts marked as HTML.
person number and `VAL' is `t' or `nil'. If `VAL' is `t', then format
HTML written by `PERS'. If `VAL' is `nil', don't. The special value The value is treated as an `indirect association list'. When
`t' for `PERS' determines the default. reading a text he author of a text is matched against the list,
and if the value of the match is non-nil, the HTML formatting may
be attempted. The matching rules are as follows:
Element Meaning
------------------------------------------------------------------
`ATOM' Matches with the default value if ATOM equals
the author number (this means that you can set
this variable to a list of person numbers).
`(t . VAL)' Matches with value VAL if no other match is
found (i.e. sets the default value).
`(FN . VAL)' Matches with value VAL if FN is a function that
returns non-nil when called with the author
number as its sole argument.
`(SYM . VAL)' If SYM is bound to a list, match the author
number against that list using these rules.
VAL is used as the default value for the
matching process.
`(SYM . VAL)' If SYM is not bound to a list, matches with
the value VAL if the value of SYM equals the
author number.
`(LIST . VAL)' Match the person number against LIST using
these rules. VAL is used as the default value.
`(ATOM . VAL)' Match with value VAL if ATOM equals the
author number.
------------------------------------------------------------------
For example, the value `((5 . nil) (kom-friends . t))' will
prevent texts by person 5 from being shown as formatted HTML,
while texts by persons listed in the variable `kom-friends' can
be shown as formatted HTML.
Values other than those listed are reserved for future use." Values other than those listed are reserved for future use."
server) server)
......
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