Commit 86d11907 authored by Linus Tolke Y's avatar Linus Tolke Y
Browse files

Small fixes: Person 78 accepted, bug-report.

parent 9c0d127e
No preview for this file type
......@@ -969,11 +969,15 @@ Format is 23:29 if the text is written today. Otherwise 04-01."
(lyskom-message "%s" (lyskom-get-string 'buggreport-compilestart))
(set-buffer old-buf)
(cond
((eq old-buf (process-buffer lyskom-proc)))
((save-excursion
(set-buffer (process-buffer lyskom-proc))
(set-buffer lyskom-unparsed-buffer)
(eq old-buf (current-buffer)))
((condition-case error
(eq old-buf (process-buffer lyskom-proc))
(error nil)))
((condition-case error
(save-excursion
(set-buffer (process-buffer lyskom-proc))
(set-buffer lyskom-unparsed-buffer)
(eq old-buf (current-buffer)))
(error nil))
(set-buffer (process-buffer lyskom-proc)))
(t
(error "I dont know what buffer you are running lyskom in (%s)?"
......
......@@ -103,6 +103,22 @@ Returns the name."
))
(defun lyskom-read-conf-name-internal-verify-type (cs predicate logins)
"Returns true if CONF-STAT is of the correct type.
For types se documentation of lyskom-read-conf-name-internal.
Logins is a list of conf-nos (only significant when PREDICATE is logins)."
(or (eq predicate 'all)
(and (eq predicate 'confs)
(not (conf-type->letterbox
(conf-stat->conf-type cs))))
(and (eq predicate 'pers)
(conf-type->letterbox
(conf-stat->conf-type cs)))
(and (eq predicate 'logins)
(memq (conf-stat->conf-no cs) logins))))
(defun lyskom-read-conf-name-internal (string predicate all)
"The \"try-completion\" for the lyskom-read name.
STRING is the string to be matched.
......@@ -155,7 +171,8 @@ to conf-no translator."
parlist)))
((eq predicate 'logins)
(let ((nos (sort nos '<))
(lis (sort logins '<))
;; We need logins later on
(lis (sort (copy-sequence logins) '<))
res)
(while (and nos
lis)
......@@ -178,7 +195,18 @@ to conf-no translator."
(car mappedlist))))
(setq found (car mappedlist)))
(setq mappedlist (cdr mappedlist)))
found))))
(cond
(found)
((string-match (lyskom-get-string 'person-or-conf-no-regexp)
string)
(let* ((no (string-to-int (substring string
(match-beginning 1)
(match-end 1))))
(cs (blocking-do 'get-conf-stat no)))
(if (lyskom-read-conf-name-internal-verify-type
cs predicate logins)
no))))))))
((eq all 'lambda)
(or (= (length mappedlist) 1)
(let ((found nil))
......@@ -189,18 +217,49 @@ to conf-no translator."
(car mappedlist))))
(setq found t))
(setq mappedlist (cdr mappedlist)))
found)))
(cond
(found)
((string-match (lyskom-get-string 'person-or-conf-no-regexp)
string)
(let* ((no (string-to-int (substring string
(match-beginning 1)
(match-end 1))))
(cs (blocking-do 'get-conf-stat no)))
(if (lyskom-read-conf-name-internal-verify-type
cs predicate logins)
string)))))))
(all
(mapcar (function (lambda (no)
(conf-stat->name
(blocking-do 'get-conf-stat no))))
mappedlist))
(let ((names (mapcar (function (lambda (no)
(conf-stat->name
(blocking-do 'get-conf-stat no))))
mappedlist)))
(if (and (string-match (lyskom-get-string 'person-or-conf-no-regexp)
string)
(let* ((no (string-to-int (substring string
(match-beginning 1)
(match-end 1))))
(cs (blocking-do 'get-conf-stat no)))
(lyskom-read-conf-name-internal-verify-type cs
predicate
logins)))
(cons string names)
names)))
((and (= (length mappedlist) 1)
(string= string (conf-stat->name
(blocking-do 'get-conf-stat (car mappedlist)))))
t)
((= (length mappedlist) 0)
nil)
(if (string-match (lyskom-get-string 'person-or-conf-no-regexp)
string)
(let* ((no (string-to-int (substring string
(match-beginning 1)
(match-end 1))))
(cs (blocking-do 'get-conf-stat no)))
(if (lyskom-read-conf-name-internal-verify-type
cs predicate logins)
t))))
(t ; No exact match
(lyskom-try-complete-partials
string
......
No preview for this file type
......@@ -70,7 +70,7 @@ The defaults for this command is the conference that you are in."
((> count 0)
(lyskom-format 'latest-n count))
((< count 0)
(lyskom-format 'first-n count)))))
(lyskom-format 'first-n (- count))))))
(lyskom-completing-read 'review 'lyskom-review-by-to-get-default-for-conf
(lyskom-format 'info-by-whom info)
'person 'empty "" count info)))
......
......@@ -432,7 +432,8 @@ Ditt allm\344nna meddelande l\366d:
(buggreport-compilestart . "Skapar buggrapporten...")
(buggreport-compileend . "Skapar buggrapporten...klart")
(buggreport-description . "Detta gjorde jag:
(Fyll i dina kommentarer)\n\n\n
(Fyll i dina kommentarer nedan)\n================\n\n
================
Bland informationen nedan finns ocks\345 en lista p\345 de 100 sist tryckta
tangenterna i din emacs. Om du nyligen loggat in kan den inneh\345lla ditt
lyskoml\366senord. Titta igenom den och \344ndra det som \344r ditt l\366senord
......
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