Menu
▾
▴
[SCM] emacs-jabber branch, master, updated. 8257959a069b51a3bdaba5e63cb7ebf0be9b961f
|
From: Magnus H. <leg...@us...> - 2013-10-18 20:32:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 8257959a069b51a3bdaba5e63cb7ebf0be9b961f (commit)
via 7b4c286b5be84d5178cf6d712eefec4a57c18eb3 (commit)
from 993b1d7fbeddc03d0d0e187fe7c8b7354cc6b330 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8257959a069b51a3bdaba5e63cb7ebf0be9b961f
Author: Magnus Henoch <mag...@gm...>
Date: Fri Oct 18 21:32:01 2013 +0100
Move history files into user-emacs-directory; default to per-contact history
Avoid breaking existing installations: if the global history file
already exists, use it; if the file/directory exists at the old
location, keep using it.
diff --git a/jabber-history.el b/jabber-history.el
index de9224d..3b2bcb0 100644
--- a/jabber-history.el
+++ b/jabber-history.el
@@ -49,40 +49,46 @@ Default is nil, cause MUC logging may be i/o-intensive."
:type 'boolean
:group 'jabber-history)
-(defcustom jabber-use-global-history t
- "Indicate whether Emacs Jabber should use a global file for
- store messages. If non-nil, jabber-global-history-filename is
- used, otherwise, messages are stored in per-user files under
- the jabber-history-dir directory."
- :type 'boolean
- :group 'jabber-history)
-
-(defcustom jabber-history-dir "~/.emacs-jabber"
+(defcustom jabber-history-dir
+ (locate-user-emacs-file "jabber-history" ".emacs-jabber")
"Base directory where per-contact history files are stored.
- Used only when jabber-use-global-history is not true."
+Used only when `jabber-use-global-history' is nil."
:type 'directory
:group 'jabber-history)
-(defcustom jabber-global-history-filename "~/.jabber_global_message_log"
- "Global file where all messages are logged. Used when
- jabber-use-global-history is non-nil."
+(defcustom jabber-global-history-filename
+ (locate-user-emacs-file "jabber-global-message-log" ".jabber_global_message_log")
+ "Global file where all messages are logged.
+Used when `jabber-use-global-history' is non-nil."
:type 'file
:group 'jabber-history)
+(defcustom jabber-use-global-history
+ ;; Using a global history file by default was a bad idea. Let's
+ ;; default to per-user files unless the global history file already
+ ;; exists, to avoid breaking existing installations.
+ (file-exists-p jabber-global-history-filename)
+ "Whether to use a global file for message history.
+If non-nil, `jabber-global-history-filename' is used, otherwise,
+messages are stored in per-user files under the
+`jabber-history-dir' directory."
+ :type 'boolean
+ :group 'jabber-history)
+
(defcustom jabber-history-enable-rotation nil
"Whether history files should be renamed when reach
- jabber-history-size-limit kilobytes. If nil, history files
- will grow indefinitely, otherwise they'll be renamed to
- <history-file>-<number>, where <number> is 1 or the smallest
- number after the last rotation."
+`jabber-history-size-limit' kilobytes. If nil, history files
+will grow indefinitely, otherwise they'll be renamed to
+<history-file>-<number>, where <number> is 1 or the smallest
+number after the last rotation."
:type 'boolean
:group 'jabber-history)
(defcustom jabber-history-size-limit 1024
- "Maximum history file size in kilobytes. When history file
- reaches this limit, it is renamed to <history-file>-<number>,
- where <number> is 1 or the smallest number after the last
- rotation."
+ "Maximum history file size in kilobytes.
+When history file reaches this limit, it is renamed to
+<history-file>-<number>, where <number> is 1 or the smallest
+number after the last rotation."
:type 'integer
:group 'jabber-history)
diff --git a/jabber.texi b/jabber.texi
index 7d65fca..07419e3 100644
--- a/jabber.texi
+++ b/jabber.texi
@@ -1443,16 +1443,18 @@ saving (by default, all groups rolled down). Also note that at now,
@vindex jabber-log-lines-to-keep
If you want a record of messages sent and received, set
-@code{jabber-history-enabled} to t. If you also want record MUC groupchat
-messages, set @code{jabber-history-muc-enabled} to t. By default all messages will
-be saved to a global history file specified by
-@code{jabber-global-history-filename}
-(@file{~/.jabber_global_message_log} by default). If you prefer to
-store your chats' history in per-contact files, you can set
-@code{jabber-use-global-history} to @code{nil}. When using
-per-contact history, files are named by the contact JID and saved
-under the directory specified by the variable
-@code{jabber-history-dir} (default is @file{~/.emacs-jabber}).
+@code{jabber-history-enabled} to t. If you also want record MUC
+groupchat messages, set @code{jabber-history-muc-enabled} to t.
+Messages will be saved in one file per contact in the directory
+specified by the variable @code{jabber-history-dir} (the default is
+@file{~/.emacs.d/jabber-history}). If you prefer to store messages
+for all contacts in a single file, set
+@code{jabber-use-global-history} to @code{t} and set
+@code{jabber-global-history-filename} as required.@footnote{Using a
+global history file used to be the default. If the file specified by
+@code{jabber-global-history-filename} exists,
+@code{jabber-use-global-history} will default to @code{t} to support
+existing installations.}
When you open a new chat buffer and have entries in your history file,
the last few messages you recently exchanged with the contact in
commit 7b4c286b5be84d5178cf6d712eefec4a57c18eb3
Author: Magnus Henoch <mag...@gm...>
Date: Fri Oct 18 20:16:51 2013 +0100
Put avatar cache inside user-emacs-directory
Avoid polluting the user's home directory.
diff --git a/jabber-avatar.el b/jabber-avatar.el
index 3f0d73a..8a956ba 100644
--- a/jabber-avatar.el
+++ b/jabber-avatar.el
@@ -41,7 +41,8 @@
"Avatar related settings"
:group 'jabber)
-(defcustom jabber-avatar-cache-directory "~/.jabber-avatars/"
+(defcustom jabber-avatar-cache-directory
+ (locate-user-emacs-file "jabber-avatar-cache" ".jabber-avatars")
"Directory to use for cached avatars"
:group 'jabber-avatar
:type 'directory)
@@ -159,7 +160,7 @@ If there is no cached image, return nil."
(filename (expand-file-name id jabber-avatar-cache-directory))
(buffer (create-file-buffer filename)))
(unless (file-directory-p jabber-avatar-cache-directory)
- (make-directory jabber-avatar-cache-directory))
+ (make-directory jabber-avatar-cache-directory t))
(if (file-exists-p filename)
(when jabber-avatar-verbose
diff --git a/jabber.texi b/jabber.texi
index 775311b..7d65fca 100644
--- a/jabber.texi
+++ b/jabber.texi
@@ -1063,7 +1063,9 @@ behave incorrectly if the image is not in a format supported by Emacs.)
Avatars are cached in the directory specified by
@code{jabber-avatar-cache-directory}, by default
-@file{~/.jabber-avatars/}. The cache is never cleaned, so you might
+@file{~/.emacs.d/jabber-avatar-cache/}.@footnote{The default directory
+used to be @file{~/.jabber-avatars}. If this directory already
+exists, it will be used.} The cache is never cleaned, so you might
want to do that yourself from time to time.
@node Time queries, Useful features, Avatars, Top
-----------------------------------------------------------------------
Summary of changes:
jabber-avatar.el | 5 +++--
jabber-history.el | 48 +++++++++++++++++++++++++++---------------------
jabber.texi | 26 +++++++++++++++-----------
3 files changed, 45 insertions(+), 34 deletions(-)
hooks/post-receive
--
emacs-jabber
|