projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added comment.
[riece]
/
lisp
/
riece-log.el
diff --git
a/lisp/riece-log.el
b/lisp/riece-log.el
index
7d889fb
..
a905e73
100644
(file)
--- a/
lisp/riece-log.el
+++ b/
lisp/riece-log.el
@@
-45,13
+45,6
@@
:type 'directory
:group 'riece-log)
:type 'directory
:group 'riece-log)
-(defcustom riece-log-lock-directory
- (expand-file-name ".lock" riece-log-directory)
- "*Lock directory for riece-log.
-It is created if there is at least one instance of Emacs running riece-log."
- :type 'directory
- :group 'riece-log)
-
(defcustom riece-log-directory-map nil
"*The map of channel name and directory name."
:type '(repeat (cons (string :tag "Channel name")
(defcustom riece-log-directory-map nil
"*The map of channel name and directory name."
:type '(repeat (cons (string :tag "Channel name")
@@
-96,6
+89,10
@@
If integer, flash back only this line numbers. t means all lines."
:group 'riece-highlight-faces)
(defvar riece-log-date-face 'riece-log-date-face)
:group 'riece-highlight-faces)
(defvar riece-log-date-face 'riece-log-date-face)
+(defvar riece-log-lock-file nil
+ "Lock file for riece-log.
+It is created if there is at least one instance of Emacs running riece-log.")
+
(defvar riece-log-enabled nil)
(defconst riece-log-description
(defvar riece-log-enabled nil)
(defconst riece-log-description
@@
-111,7
+108,8
@@
If integer, flash back only this line numbers. t means all lines."
(make-directory (file-name-directory file) t))
(write-region (concat (format-time-string "%H:%M") " "
(riece-format-message message))
(make-directory (file-name-directory file) t))
(write-region (concat (format-time-string "%H:%M") " "
(riece-format-message message))
- nil file t 0))))
+ nil file t 0
+ riece-log-lock-file))))
(defun riece-log-get-file (identity)
(expand-file-name
(defun riece-log-get-file (identity)
(expand-file-name
@@
-255,6
+253,13
@@
If LINES is t, insert today's logs entirely."
'(riece-button)))
(defun riece-log-insinuate ()
'(riece-button)))
(defun riece-log-insinuate ()
+ (make-directory riece-log-directory t)
+ (setq riece-log-lock-file
+ (expand-file-name (format "!%s-%d-%d"
+ (riece-log-encode-file-name (system-name))
+ (user-uid)
+ (emacs-pid))
+ riece-log-directory))
;; FIXME: Use `riece-after-insert-functions' for trapping change,
;; notice, wallops and so on. But must add argument.
(add-hook 'riece-after-display-message-functions
;; FIXME: Use `riece-after-insert-functions' for trapping change,
;; notice, wallops and so on. But must add argument.
(add-hook 'riece-after-display-message-functions
@@
-265,18
+270,10
@@
If LINES is t, insert today's logs entirely."
(defvar riece-command-mode-map)
(defun riece-log-enable ()
(define-key riece-command-mode-map "\C-cd" 'riece-log-open-directory)
(defvar riece-command-mode-map)
(defun riece-log-enable ()
(define-key riece-command-mode-map "\C-cd" 'riece-log-open-directory)
- (make-directory riece-log-directory t)
- (condition-case nil
- (progn
- (make-directory riece-log-lock-directory)
- (setq riece-log-enabled t))
- (error)))
+ (setq riece-log-enabled t))
(defun riece-log-disable ()
(define-key riece-command-mode-map "\C-cd" nil)
(defun riece-log-disable ()
(define-key riece-command-mode-map "\C-cd" nil)
- (condition-case nil
- (delete-directory riece-log-lock-directory)
- (error))
(setq riece-log-enabled nil))
(provide 'riece-log)
(setq riece-log-enabled nil))
(provide 'riece-log)