Skip to content

GitLab

Commit 7598e87b authored by David Byers's avatar David Byers
Browse files

Bug i lyskom-lookup-conf-by-name 

Go to point-max i lyskom-button-actions
parent f11d8fac
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 17 deletions
src/ChangeLog
View file @ 7598e87b
2000-07-28 David Byers <davby@ida.liu.se>
* completing-read.el (lyskom-read-conf-lookup-specials): Return
conf-z-info, not uconf-stat.
2000-07-27 David Byers <davby@ida.liu.se>
* lyskom-buttons.el: Go to point-max in relevant button actions.
2000-07-25 David Byers <davby@ida.liu.se>
* lyskom-buttons.el (lyskom-keyboard-menu): Couldn't handle
symbols for menu items in lyskom-button-actions. Fixed.
2000-07-17 David Byers <davby@ida.liu.se>
* vars.el.in (lyskom-add-sub-recipients-hook): Renamed function
......
src/completing-read.el
View file @ 7598e87b
......@@ -268,11 +268,14 @@ conference number specifications to something useful."
(defun lyskom-read-conf-lookup-specials (string predicate login-list x-list)
"Used internally by lyskom-read-conf-internal to look up conf-stats
from person and conference number specifications."
(lyskom-read-conf-expand-specials string
predicate
login-list
x-list
t))
(let ((cs (lyskom-read-conf-expand-specials string
predicate
login-list
x-list
t)))
(lyskom-create-conf-z-info (uconf-stat->name cs)
(uconf-stat->conf-type cs)
(uconf-stat->conf-no cs))))
(defun lyskom-lookup-conf-by-name (string predicate)
"Return the conf-z-info associated with STRING that also satisfies
......@@ -354,14 +357,14 @@ function work as a name-to-conf-stat translator."
login-list
candidate-list)))
(cond ((and kom-complete-numbers-before-names
specials)
(cond ((and kom-complete-numbers-before-names specials)
(lyskom-read-conf-lookup-specials string
predicate
login-list
candidate-list))
((= (length result-list) 1)
(car result-list))
((and (> (length result-list) 1)
(lyskom-completing-member string names))
(elt result-list
......
src/lyskom-buttons.el
View file @ 7598e87b
......@@ -227,22 +227,28 @@ If there is no active area, then do something else."
(defun lyskom-keyboard-menu (title entries buf arg text)
"Do a keyboard menu selection."
(let ((prompt nil)
(maxlen 0)
(e entries)
(completion-ignore-case t))
(while e
(if (> (lyskom-string-width (car (car e))) maxlen)
(setq maxlen (lyskom-string-width (car (car e)))))
(setq e (cdr e)))
(let* ((prompt nil)
(maxlen 0)
(entries (mapcar (lambda (el)
(cons (if (stringp (car el)) (car el) (lyskom-get-string (car el)))
(cdr el))) entries))
(title (if (stringp title) title (lyskom-get-string title)))
(completion-ignore-case t))
(lyskom-traverse e entries
(if (> (lyskom-string-width (car e)) maxlen)
(setq maxlen (lyskom-string-width (car e)))))
(setq prompt (concat
(substring title 0
(min (lyskom-string-width title)
(- (window-width (minibuffer-window))
maxlen 3))) ": "))
(let ((choice (completing-read prompt entries nil t
(cons (car (car entries)) 0) nil)))
(let ((choice (completing-read prompt
entries
nil
t
(cons (car (car entries))
0) nil)))
(when choice
(funcall (cdr (lyskom-string-assoc choice entries))
buf arg text)))))
......@@ -547,6 +553,7 @@ up."
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-view arg))))
(defun lyskom-button-review-noconversion (buf arg text)
......@@ -554,6 +561,7 @@ This is a LysKOM button action."
Last argument TEXT is ignored. This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-review-noconversion arg))))
(defun lyskom-button-review-tree (buf arg text)
......@@ -561,6 +569,7 @@ Last argument TEXT is ignored. This is a LysKOM button action."
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-review-tree arg))))
(defun lyskom-button-find-root (buf arg text)
......@@ -568,6 +577,7 @@ This is a LysKOM button action."
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-find-root arg))))
(defun lyskom-button-comment-text (buf arg text)
......@@ -622,6 +632,7 @@ Last argument TEXT is ignored.
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-review-presentation arg))))
(defun lyskom-button-view-conf-status (buf arg text)
......@@ -630,6 +641,7 @@ TEXT is ignored.
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-status-conf arg))))
(defun lyskom-button-goto-conf (buf arg text)
......@@ -638,6 +650,7 @@ ignored.
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-go-to-conf arg))))
(defun lyskom-button-add-self (buf arg text)
......@@ -664,6 +677,7 @@ Last argument TEXT is ignored.
This is a LysKOM button action."
(cond ((not (integerp arg)) nil)
(t (pop-to-buffer buf)
(goto-char (point-max))
(kom-status-person arg))))
(defun lyskom-button-mail (buf arg text)
......@@ -1039,6 +1053,7 @@ depending on the value of `kom-lynx-terminal'."
(defun lyskom-button-info-aux (buf arg text)
(pop-to-buffer buf)
(goto-char (point-max))
(let ((aux nil))
(cond ((lyskom-aux-item-p arg))
((listp arg)
......
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