Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib

diff --git a/emacs_el/configuration/org-mode-configuration.el b/emacs_el/configuration/org-mode-configuration.el
index 78a07f7becb2e1d65266704b20251bed37a911ac..bb3ff9c0ea26fef57ae014ca44bba30854b8d237 100644 (file)
--- a/emacs_el/configuration/org-mode-configuration.el
+++ b/emacs_el/configuration/org-mode-configuration.el
@@ -103,7 +103,7 @@
              "~/projects/fh/fh.org")))
 
 (setq org-global-properties '(("Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00")))
-(setq org-columns-default-format "%40ITEM(Task) %TAGS %PRIORITY %TODO %13SCHEDULED %13DEADLINE %6Effort{:}  %CLOCKSUM")
+(setq org-columns-default-format "%40ITEM(Task) %6Effort{:} %CLOCKSUM %PRIORITY %TODO %13SCHEDULED %13DEADLINE %TAGS")
 
 (setq org-default-notes-file "~/projects/notes/notes.org")
 (setq org-capture-templates  ;; mail-specific note template, identified by "m"
@@ -416,7 +416,8 @@ Maildir, or by Message-ID."
 ;; org mode ical export
 (setq org-icalendar-timezone "America/Los_Angeles")
 (setq org-icalendar-use-scheduled '(todo-start event-if-todo))
-(setq org-icalendar-store-UID t)
+;; we already add the id manually
+;; (setq org-icalendar-store-UID t)
 
 ;; org babel support
 (org-babel-do-load-languages

diff --git a/perl/generate_upsert.pm b/perl/generate_upsert.pm
index c49228192bd24c8061ab22a8999377001305de9d..1c32fa792a7235aa5d3086e8c4bdb031e7977560 100644 (file)
--- a/perl/generate_upsert.pm
+++ b/perl/generate_upsert.pm
@@ -39,9 +39,9 @@ sub generate_upsert{
     my @cols = map {ref($_)?$_->[0]:$_} @{$param{columns}};
     my %cols_types;
     @cols_types{@keys,@cols} = map {ref($_)?($_->[0].'::'.$_->[1]):$_} @{$param{keys}},@{$param{columns}};
-    my $cols = join(',',@keys,@cols);
-    my $cols_types = join(',',map{$cols_types{$_}} @cols);
-    my $placeholders = join(',',('?') x (@cols + @keys));
+    my $cols = join(', ',@keys,@cols);
+    my $cols_types = join(', ',map{$cols_types{$_}} @keys, @cols);
+    my $placeholders = join(', ',('?') x (@cols + @keys));
     my $set = join(",\n",map {qq($_ = new_values.$cols_types{$_})} @cols);
     my $where_up = join(' AND ',map {qq(up.$cols_types{$_} = new_values.$cols_types{$_})} @keys);
     my $where_set = join(' AND ',map {qq(t.$cols_types{$_} = new_values.$cols_types{$_})} @keys);

diff --git a/signature_stuff/quote.txt b/signature_stuff/quote.txt
index f7c3b681cdecb532a460da81419201c50108e6b4..cbdee6d843ad07ecae018ba39d2613b518dbdea4 100644 (file)
--- a/signature_stuff/quote.txt
+++ b/signature_stuff/quote.txt
@@ -1044,3 +1044,7 @@ Le temps est un grand maître, dit-on; le malheur est qu'il soit un
 maître inhumain qui tue ses élèves.
 Time is a great teacher, but unfortunately it kills all its pupils.
  -- Hector Berlioz
+%
+That's the wonderful thing about crayons. They can take you to more
+places than a starship.
+ -- Guinan "Star Trek: The Next Generation: Rascals (#6.7)"