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

Fixed compatibility problems with new face code and date reading.

Everything should be functional with Emacs 21.x, 20.7 and XEmacs 21.1.
Other versions have not been tested yet.

Detailed changes:
> 2003-01-02  David Byers  <david.byers@swipnet.se>
>
> 	Cosmetics:
> 	* commands2.el (kom-set-unread): Don't include range in prompt. It
> 	will be included by lyskom-read-num-range-or-date.
>
> 	Compatibility issues with date reading:
> 	* compatibility.el (lyskom-minibuffer-contents): Provide an alias
> 	for minibuffer-contents.
>
> 	* lyskom-rest.el (lyskom-verified-read-enter): Use
> 	lyskom-minibuffer-contents instead of minibuffer-contents.
>
> 	Work on new face code:
> 	* faces.el: Fixed bug in call to defface that worked in Gnu Emacs
> 	but not in XEmacs.
>
parent 5b04897f
2003-01-02 David Byers <david.byers@swipnet.se>
Cosmetics:
* commands2.el (kom-set-unread): Don't include range in prompt. It
will be included by lyskom-read-num-range-or-date.
Compatibility issues with date reading:
* compatibility.el (lyskom-minibuffer-contents): Provide an alias
for minibuffer-contents.
* lyskom-rest.el (lyskom-verified-read-enter): Use
lyskom-minibuffer-contents instead of minibuffer-contents.
Work on new face code:
* faces.el: Fixed bug in call to defface that worked in Gnu Emacs
but not in XEmacs.
2003-01-01 David Byers <david.byers@swipnet.se> 2003-01-01 David Byers <david.byers@swipnet.se>
Work on new face code: Work on new face code:
......
...@@ -745,7 +745,6 @@ send. If DONTSHOW is non-nil, don't display the sent message." ...@@ -745,7 +745,6 @@ send. If DONTSHOW is non-nil, don't display the sent message."
narg narg
(lyskom-read-num-range-or-date 0 (conf-stat->no-of-texts conf-stat) (lyskom-read-num-range-or-date 0 (conf-stat->no-of-texts conf-stat)
(lyskom-format 'only-last (lyskom-format 'only-last
(conf-stat->no-of-texts conf-stat)
(conf-stat->name conf-stat))))) (conf-stat->name conf-stat)))))
(membership nil)) (membership nil))
(cond ((listp n) (cond ((listp n)
......
...@@ -424,11 +424,18 @@ string to search in." ...@@ -424,11 +424,18 @@ string to search in."
read read
hist))))) hist)))))
(if (fboundp 'minibuffer-contents)
(defalias 'lyskom-minibuffer-contents 'minibuffer-contents)
(defalias 'lyskom-minibuffer-contents 'buffer-string))
(lyskom-external-function temp-minibuffer-message) (lyskom-external-function temp-minibuffer-message)
(lyskom-provide-function minibuffer-message (message) (lyskom-provide-function minibuffer-message (message)
(temp-minibuffer-message message)) (temp-minibuffer-message message))
(lyskom-provide-function last (x &optional n) (lyskom-provide-function last (x &optional n)
"Returns the last link in the list LIST. "Returns the last link in the list LIST.
With optional argument N, returns the Nth-to-last link (default 1)." With optional argument N, returns the Nth-to-last link (default 1)."
......
...@@ -722,7 +722,7 @@ Read all about it at http://www.lysator.liu.se/history/") ...@@ -722,7 +722,7 @@ Read all about it at http://www.lysator.liu.se/history/")
"Unable to send the message. Perhaps the recipient isn't logged on. "Unable to send the message. Perhaps the recipient isn't logged on.
The message you were sending to %#1M was: The message you were sending to %#1M was:
%#2t\n") %#2t\n")
(only-last . "Last (0 - %#1d) texts in %#2s: ") (only-last . "Last texts in %#1s: ")
(only-error . "Something went wrong. Sorry.\n") (only-error . "Something went wrong. Sorry.\n")
(you-have-unreads . "You have %#1d unread text%#1?d%[%]%[s%] in %#2M\n") (you-have-unreads . "You have %#1d unread text%#1?d%[%]%[s%] in %#2M\n")
......
...@@ -389,10 +389,10 @@ for `lyskom-background-colors' for more information." ...@@ -389,10 +389,10 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--active-face (defface kom-face--plain--active-face
'((((background light)) '((((background light))
:foreground "blue4" (:foreground "blue4")
) )
(((background dark)) (((background dark))
:foreground "lightblue" (:foreground "lightblue")
) )
) )
"Face used for most \"clickable\" areas." "Face used for most \"clickable\" areas."
...@@ -402,10 +402,10 @@ for `lyskom-background-colors' for more information." ...@@ -402,10 +402,10 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--url-face (defface kom-face--plain--url-face
'((((background light)) '((((background light))
:foreground "blueviolet" (:foreground "blueviolet")
) )
(((background dark)) (((background dark))
:foreground "moccasin" (:foreground "moccasin")
) )
) )
"Face used for URLs." "Face used for URLs."
...@@ -415,14 +415,14 @@ for `lyskom-background-colors' for more information." ...@@ -415,14 +415,14 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--me-face (defface kom-face--plain--me-face
'((((background light)) '((((background light))
:foreground "blue3" (:foreground "blue3"
:background "lavender" :background "lavender"
:weight bold :weight bold)
) )
(((background dark)) (((background dark))
:foreground "gold" (:foreground "gold"
:background "black" :background "black"
:weight bold :weight bold)
) )
) )
"Face used to show your own name." "Face used to show your own name."
...@@ -432,10 +432,10 @@ for `lyskom-background-colors' for more information." ...@@ -432,10 +432,10 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--highlight-face (defface kom-face--plain--highlight-face
'((((background light)) '((((background light))
:background "seagreen" (:background "seagreen")
) )
(((background dark)) (((background dark))
:background "darkblue" (:background "darkblue")
) )
) )
"Face used for various highlights." "Face used for various highlights."
...@@ -456,10 +456,10 @@ for `lyskom-background-colors' for more information." ...@@ -456,10 +456,10 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--text-no-face (defface kom-face--plain--text-no-face
'((((background light)) '((((background light))
:foreground "blue4" (:foreground "blue4")
) )
(((background dark)) (((background dark))
:foreground "lightblue" (:foreground "lightblue")
) )
) )
"Face used for text numbers." "Face used for text numbers."
...@@ -468,11 +468,11 @@ for `lyskom-background-colors' for more information." ...@@ -468,11 +468,11 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--friends-face (defface kom-face--plain--friends-face
'((((background light)) '((((background light))
:foreground "blue3" (:foreground "blue3"
:background "lavender" :background "lavender")
) )
(((background dark)) (((background dark))
:foreground "red" (:foreground "red")
) )
) )
"Face used for people in kom-friends." "Face used for people in kom-friends."
...@@ -481,11 +481,11 @@ for `lyskom-background-colors' for more information." ...@@ -481,11 +481,11 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--morons-face (defface kom-face--plain--morons-face
'((((background light)) '((((background light))
:foreground "blue3" (:foreground "blue3"
:background "yellow" :background "yellow")
) )
(((background dark)) (((background dark))
:foreground "yellow" (:foreground "yellow")
) )
) )
"Face used for people in kom-morons." "Face used for people in kom-morons."
...@@ -494,12 +494,12 @@ for `lyskom-background-colors' for more information." ...@@ -494,12 +494,12 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--presence-face (defface kom-face--plain--presence-face
'((((background light)) '((((background light))
:foreground "dim gray" (:foreground "dim gray"
:slant italic :slant italic)
) )
(((background dark)) (((background dark))
:foreground "gray" (:foreground "gray"
:slant italic :slant italic)
) )
) )
"Face used for presence messages." "Face used for presence messages."
...@@ -509,12 +509,12 @@ for `lyskom-background-colors' for more information." ...@@ -509,12 +509,12 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--mark-face (defface kom-face--plain--mark-face
'((((background light)) '((((background light))
:foreground "blue3" (:foreground "blue3"
:background "lavender" :background "lavender")
) )
(((background dark)) (((background dark))
:foreground "gold" (:foreground "gold"
:background "black" :background "black")
) )
) )
"Face used for temporary marks." "Face used for temporary marks."
...@@ -523,19 +523,19 @@ for `lyskom-background-colors' for more information." ...@@ -523,19 +523,19 @@ for `lyskom-background-colors' for more information."
(defface kom-face--plain--first-line-face (defface kom-face--plain--first-line-face
'((t :weight bold)) '((t (:weight bold)))
"Face used for the first line header of each text." "Face used for the first line header of each text."
:group 'lyskom-faces :group 'lyskom-faces
) )
(defface kom-face--plain--warning-face (defface kom-face--plain--warning-face
'((t :weight bold :foreground "red")) '((t (:weight bold :foreground "red")))
"Face used to display important warnings." "Face used to display important warnings."
:group 'lyskom-faces :group 'lyskom-faces
) )
(defface kom-face--plain--dim-face (defface kom-face--plain--dim-face
'((t :foreground "gray")) '((t (:foreground "gray")))
"Face used to display dimmed items, such as passive memberships." "Face used to display dimmed items, such as passive memberships."
:group 'lyskom-faces :group 'lyskom-faces
) )
...@@ -3340,7 +3340,7 @@ VECTOR has to be sorted with regard to <." ...@@ -3340,7 +3340,7 @@ VECTOR has to be sorted with regard to <."
(defvar lyskom-verified-read-predicate nil) (defvar lyskom-verified-read-predicate nil)
(defun lyskom-verified-read-enter () (defun lyskom-verified-read-enter ()
(interactive) (interactive)
(let* ((val (minibuffer-contents)) (let* ((val (lyskom-minibuffer-contents))
(err (funcall lyskom-verified-read-predicate val))) (err (funcall lyskom-verified-read-predicate val)))
(if err (if err
(minibuffer-message (format " [%s]" err)) (minibuffer-message (format " [%s]" err))
......
...@@ -718,7 +718,7 @@ Ditt alarmmeddelande l ...@@ -718,7 +718,7 @@ Ditt alarmmeddelande l
. "Du kunde inte skicka meddelandet. Mottagaren var kanske inte inloggad. . "Du kunde inte skicka meddelandet. Mottagaren var kanske inte inloggad.
Meddelandet du frskte snda till %#1M var: Meddelandet du frskte snda till %#1M var:
%#2t\n") %#2t\n")
(only-last . "Endast lsa senaste (0 - %#1d) i %#2s: ") (only-last . "Endast lsa senaste i %#1s: ")
(only-error . "Ngot gick galet. Ledsen.\n") (only-error . "Ngot gick galet. Ledsen.\n")
(you-have-unreads . "Du har %#1d olst%#1?d%[%]%[a%] inlgg i %#2M\n") (you-have-unreads . "Du har %#1d olst%#1?d%[%]%[a%] inlgg i %#2M\n")
......
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