Commit f5c8e116 authored by David Kågedal's avatar David Kågedal
Browse files

Ett par bugfixar och en ny mode-line-process.

parent 6bb92fd9
No preview for this file type
...@@ -114,7 +114,7 @@ this function shall be with current-buffer the BUFFER." ...@@ -114,7 +114,7 @@ this function shall be with current-buffer the BUFFER."
(if (and (not (lyskom-is-in-minibuffer)) (if (and (not (lyskom-is-in-minibuffer))
kom-presence-messages) kom-presence-messages)
(lyskom-message "%s" (lyskom-get-string 'database-sync))) (lyskom-message "%s" (lyskom-get-string 'database-sync)))
(setq mode-line-process ": saving") (setq mode-line-process (lyskom-get-string 'mode-line-saving))
(set-buffer-modified-p (buffer-modified-p)) (set-buffer-modified-p (buffer-modified-p))
(sit-for 0) (sit-for 0)
(if (not lyskom-pending-calls) (if (not lyskom-pending-calls)
......
...@@ -620,6 +620,11 @@ Group message to %#3M from %#2P (%#4s): ...@@ -620,6 +620,11 @@ Group message to %#3M from %#2P (%#4s):
---------------------------------------------------------------- ----------------------------------------------------------------
") (text-is-created . "Article %#1d has been created!") ") (text-is-created . "Article %#1d has been created!")
; Used in mode-line-process
(mode-line-waiting . ": waiting")
(mode-line-working . ": working")
(mode-line-saving . ": saving")
(mode-line-down . ": down")
; From completing-read.el: ; From completing-read.el:
......
...@@ -113,6 +113,8 @@ ...@@ -113,6 +113,8 @@
(let* ((menu (cons title (cons (cons "" actl) nil))) (let* ((menu (cons title (cons (cons "" actl) nil)))
(result (x-popup-menu event menu))) (result (x-popup-menu event menu)))
;; The menu code seems to leave a mouse event behind
(read-event)
(if result (if result
(funcall result buf arg text))))))) (funcall result buf arg text)))))))
......
No preview for this file type
...@@ -804,15 +804,16 @@ lyskom-parse-success, lyskom-parse-error and lyskom-parse-async calls ...@@ -804,15 +804,16 @@ lyskom-parse-success, lyskom-parse-error and lyskom-parse-async calls
functions and variables that are connected with the lyskom-buffer." functions and variables that are connected with the lyskom-buffer."
(let ((lyskom-buffer (current-buffer)) (let ((lyskom-buffer (current-buffer))
(match-data (match-data))) (match-data (match-data)))
(if (and mode-line-process ;; I wonder what happens if I remove this? /davidk
(not (equal mode-line-process '(": %s")))) ;; (if (and mode-line-process
(progn ;; (not (equal mode-line-process '(": %s"))))
(setq mode-line-process '(": %s")) ;; (progn
(if (and (not (lyskom-is-in-minibuffer)) ;; (setq mode-line-process '(": %s"))
kom-presence-messages) ;; (if (and (not (lyskom-is-in-minibuffer))
(message "")) ;; kom-presence-messages)
(set-buffer-modified-p (buffer-modified-p)) ;; (message ""))
(sit-for 0))) ;; (set-buffer-modified-p (buffer-modified-p))
;; (sit-for 0)))
(lyskom-save-excursion (lyskom-save-excursion
(set-buffer lyskom-unparsed-buffer) (set-buffer lyskom-unparsed-buffer)
(if (and (> lyskom-string-bytes-missing 0) (if (and (> lyskom-string-bytes-missing 0)
......
...@@ -696,9 +696,9 @@ or get-text-stat." ...@@ -696,9 +696,9 @@ or get-text-stat."
(accept-process-output)) (accept-process-output))
(if lyskom-quit-flag (if lyskom-quit-flag
(progn (progn
(setq lyskom-quit-flag nil)
(lyskom-insert-before-prompt (lyskom-get-string 'interrupted)) (lyskom-insert-before-prompt (lyskom-get-string 'interrupted))
(signal 'quit nil))) (signal 'quit nil)))
(setq lyskom-quit-flag nil)
lyskom-blocking-return))) lyskom-blocking-return)))
......
...@@ -474,7 +474,7 @@ to see, set of call." ...@@ -474,7 +474,7 @@ to see, set of call."
(setq major-mode 'lyskom-mode) (setq major-mode 'lyskom-mode)
(setq mode-name "LysKOM") (setq mode-name "LysKOM")
(setq mode-line-process '(": %s")) (setq mode-line-process (lyskom-get-string 'mode-line-working))
(use-local-map lyskom-mode-map) (use-local-map lyskom-mode-map)
(lyskom-count-down-edits) (lyskom-count-down-edits)
(run-hooks 'lyskom-mode-hook) (run-hooks 'lyskom-mode-hook)
......
...@@ -648,6 +648,11 @@ Gruppmeddelande till %#3M fr\345n %#2P (%#4s): ...@@ -648,6 +648,11 @@ Gruppmeddelande till %#3M fr\345n %#2P (%#4s):
") ")
(text-is-created . "Text %#1n \344r skapad!") (text-is-created . "Text %#1n \344r skapad!")
; Used in mode-line-process
(mode-line-waiting . ": v\344ntar")
(mode-line-working . ": arbetar")
(mode-line-saving . ": sparar")
(mode-line-down . ": nerkopplad")
; From completing-read.el: ; From completing-read.el:
......
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