Merge commit 'b9078dc93ffdb526efd0a859a73cc3076108f6b2'

18 files changed, 40 insertions, 38 deletions

diff --git a/lisp/ledger-commodities.el b/lisp/ledger-commodities.el
index 1c7bd629..a2cdf6ac 100644
--- a/lisp/ledger-commodities.el
+++ b/lisp/ledger-commodities.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 ;; Helper functions to deal with commoditized numbers.  A commoditized
diff --git a/lisp/ledger-complete.el b/lisp/ledger-complete.el
index ae3dfb78..fd4cbcc0 100644
--- a/lisp/ledger-complete.el
+++ b/lisp/ledger-complete.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 ;; Functions providing payee and account auto complete.
diff --git a/lisp/ledger-context.el b/lisp/ledger-context.el
index cd8b29fc..064ac380 100644
--- a/lisp/ledger-context.el
+++ b/lisp/ledger-context.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 ;;; Commentary:
diff --git a/lisp/ledger-exec.el b/lisp/ledger-exec.el
index db924803..13a99125 100644
--- a/lisp/ledger-exec.el
+++ b/lisp/ledger-exec.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 ;;; Commentary:
diff --git a/lisp/ledger-fonts.el b/lisp/ledger-fonts.el
index 41c7a4aa..5194e876 100644
--- a/lisp/ledger-fonts.el
+++ b/lisp/ledger-fonts.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 
@@ -40,7 +40,8 @@
   :group 'ledger-faces)
 
 (defface ledger-font-xact-highlight-face
-    `((t :background "#eee8d5"))
+    `((((background dark)) :background "#1a1a1a" )
+      (t :background "#eee8d5"))
   "Default face for transaction under point"
   :group 'ledger-faces)
 
@@ -80,7 +81,8 @@
   :group 'ledger-faces)
 
 (defface ledger-occur-xact-face
-    `((t :background "#eee8d5" ))
+    `((((background dark)) :background "#1a1a1a" )
+      (t :background "#eee8d5" ))
   "Default face for Ledger occur mode shown transactions"
   :group 'ledger-faces)
 
diff --git a/lisp/ledger-init.el b/lisp/ledger-init.el
index 277b0f04..531f2c45 100644
--- a/lisp/ledger-init.el
+++ b/lisp/ledger-init.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 ;; Determine the ledger environment
diff --git a/lisp/ledger-mode.el b/lisp/ledger-mode.el
index dfd878fc..07e6732a 100644
--- a/lisp/ledger-mode.el
+++ b/lisp/ledger-mode.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 
diff --git a/lisp/ledger-occur.el b/lisp/ledger-occur.el
index 41c993fc..24ded4ca 100644
--- a/lisp/ledger-occur.el
+++ b/lisp/ledger-occur.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 ;; Provide buffer narrowing to ledger mode.  Adapted from original loccur
diff --git a/lisp/ledger-post.el b/lisp/ledger-post.el
index 71cad87e..b8fa36ca 100644
--- a/lisp/ledger-post.el
+++ b/lisp/ledger-post.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 ;;; Commentary:
diff --git a/lisp/ledger-reconcile.el b/lisp/ledger-reconcile.el
index d58a7f4f..61de0855 100644
--- a/lisp/ledger-reconcile.el
+++ b/lisp/ledger-reconcile.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;; Reconcile mode
 
diff --git a/lisp/ledger-regex.el b/lisp/ledger-regex.el
index 47e5a9f2..8d838892 100644
--- a/lisp/ledger-regex.el
+++ b/lisp/ledger-regex.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 (require 'rx)
 
diff --git a/lisp/ledger-report.el b/lisp/ledger-report.el
index e41699a1..af9ae62c 100644
--- a/lisp/ledger-report.el
+++ b/lisp/ledger-report.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 ;;; Commentary:
diff --git a/lisp/ledger-schedule.el b/lisp/ledger-schedule.el
index c9ee4392..e1e06d69 100644
--- a/lisp/ledger-schedule.el
+++ b/lisp/ledger-schedule.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/ledger-sort.el b/lisp/ledger-sort.el
index ccb3d88d..d337cc4c 100644
--- a/lisp/ledger-sort.el
+++ b/lisp/ledger-sort.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 
diff --git a/lisp/ledger-state.el b/lisp/ledger-state.el
index 408e8337..fffaab14 100644
--- a/lisp/ledger-state.el
+++ b/lisp/ledger-state.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 ;;; Commentary:
diff --git a/lisp/ledger-test.el b/lisp/ledger-test.el
index 8ebfa44b..f74c5428 100644
--- a/lisp/ledger-test.el
+++ b/lisp/ledger-test.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 (defgroup ledger-test nil
   "Definitions for the Ledger testing framework"
diff --git a/lisp/ledger-texi.el b/lisp/ledger-texi.el
index 2e83ea02..c9e438c0 100644
--- a/lisp/ledger-texi.el
+++ b/lisp/ledger-texi.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 (defgroup ledger-texi nil
 "Options for working on Ledger texi documentation"
diff --git a/lisp/ledger-xact.el b/lisp/ledger-xact.el
index 910c7b23..35b0d62c 100644
--- a/lisp/ledger-xact.el
+++ b/lisp/ledger-xact.el
@@ -16,8 +16,8 @@
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-;; MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 
 ;;; Commentary: