merged.

Pascal J. Bourguignon [2017-01-24 22:45]
merged.
Filename
pjb-cl.el
pjb-emacs.el
pjb-strings.el
pjb-work.el
diff --git a/pjb-cl.el b/pjb-cl.el
index b9ed3b6..d0d748b 100644
--- a/pjb-cl.el
+++ b/pjb-cl.el
@@ -14,7 +14,7 @@
 ;;;;    2006-11-14 <PJB> Removed most of CL functions and downcased the rest
 ;;;;                     to avoid collision with emacs-cl.
 ;;;;    2004-11-01 <PJB> Upcased COMMON-LISP symbols.  This will avoid name
-;;;;                     collision between Common-Lisp and emacs-lisp.
+;;;;                     collision between Common-Lisp and emacs-lisp.
 ;;;;    2003-01-20 <PJB> Replaced pjb-cl%%string-replace
 ;;;;                     by regexp-replace-in-string.
 ;;;;    2002-04-10 <PJB> Creation.
@@ -141,9 +141,9 @@ RETURN: Whether `char' is in `bag'.
      (setq   ,symbol ,initvalue)))


-(defmacro multiple-value-prog1 (first-form &rest forms)
+(defmacro multiple-value-prog1 (first-form &rest forms)
   ;; Multiple values are implemented as list of values. BAD.
-  `(prog1 ,first-form ,@forms))
+  `(prog1 ,first-form ,@forms))


 (defconstant multiple-value-limit 4098)
@@ -167,7 +167,7 @@ RETURN: Whether `char' is in `bag'.

 ;; (defmacro handler-case (expression &rest clauses)
 ;;   "Evaluate expression with `condition-case' and catch errors with CLAUSES.
-;;
+;;
 ;; Longer explanation here..."
 ;;   (let* ((var (gensym))
 ;;          (neclause (assoc :NO-ERROR clauses))
@@ -231,7 +231,7 @@ RETURN: Whether `char' is in `bag'.
   "Common-Lisp
 IMPLEMENTATION: The clause variable symbols are substituted by one single
                 condition-case variable symbol.  This may cause problems
-                if the same symbol is used as data or if it's a dynamic
+                if the same symbol is used as data or if it's a dynamic
                 variable.
 "
   (let* ((var (gensym))
@@ -244,7 +244,7 @@ IMPLEMENTATION: The clause variable symbols are substituted by one single
                                    (body     (cddr clause)))
                                (cons (if (and (consp typespec)
                                               (eq 'or (car typespec)))
-                                         (cdr typespec)
+                                         (cdr typespec)
                                          typespec)
                                      (if (null clausvar)
                                          body
@@ -276,7 +276,7 @@ IMPLEMENTATION: The clause variable symbols are substituted by one single
   (let ((new (make-symbol (cl:string symbol))))
     (when copy-properties
       (setf (symbol-plist new) (COPY-SEQ (symbol-plist symbol))))
-    (setf (symbol-value    new)  (symbol-value    symbol)
+    (setf (symbol-value    new)  (symbol-value    symbol)
           (symbol-function new)  (symbol-function symbol))
     new))

@@ -299,7 +299,7 @@ colon if it contains one."
 double colon if any, or the symbol name."
   (let* ((name (symbol-name sym))
          (colon (position (character ":") name)))
-    (cond
+    (cond
       ((and colon (char= (character ":") (char name (1+ colon))))
        (subseq name (+ 2 colon)))
       (colon
@@ -492,9 +492,9 @@ url:      http://www.informatimago.com/local/lisp/hyperspec/body/f_chareq.htm
   (if (= 1 (length characters))
       t
       (loop with already-seen = nil
-            with result = t
+            with result = t
             for c in characters
-            while result
+            while result
             do (if (memq c already-seen)
                    (setq result nil)
                    (push c already-seen))
@@ -623,7 +623,7 @@ URL:      http://www.informatimago.com/local/lisp/HyperSpec/Body/f_chareq.htm


 (defun ensure-character (ch)
-  (cond
+  (cond
     ((characterp ch) ch)
     ((stringp ch)    (char ch 0))
     ((symbolp ch)    (char (cl:symbol-name ch) 0))
@@ -636,8 +636,8 @@ URL:      http://www.informatimago.com/local/lisp/HyperSpec/Body/f_chareq.htm
 COMMON-LISP
 IMPLEMENTATION: Assumes ISO-8859-1!
 "
-;;;   (string-match
-;;;    "\\(\\c0\\|\\c1\\|\\c2\\|\\c3\\|\\c4\\|\\c6\\|\\c7\\|\\c8\\|\\c9\\)"
+;;;   (string-match
+;;;    "\\(\\c0\\|\\c1\\|\\c2\\|\\c3\\|\\c4\\|\\c6\\|\\c7\\|\\c8\\|\\c9\\)"
 ;;;    (format "%c" ch))
   ;; 0: consonant
   ;; 1: base (independent) vowel
@@ -711,7 +711,7 @@ IMPLEMENTATION: Assumes ISO-8859-1!

 ;; c[ad]{2,4}r are defined in cl-macs.el
 ;; butlast, nbutlast are primitives in emacs 21.2.
-
+

 ;; ---------------
 ;; - 15 - Arrays -
@@ -1371,7 +1371,7 @@ by the corresponding lowercase characters.
              (min (apply (function min) (mapcar (function length) sequences)))
              (target result-sequence (cdr target)))
             ((or (null target) (>= source min)) result-sequence)
-          (setf (car target)
+          (setf (car target)
                 (apply function (mapcar (lambda (seq) (aref seq source))
                                         sequences)))))
        ((vectorp* result-sequence)
@@ -1386,7 +1386,7 @@ by the corresponding lowercase characters.
     (t
      (do ((res
            (make-instance
-               (cond
+               (cond
                  ((listp    result-sequence) 'iterator-list)
                  ((vectorp* result-sequence) 'iterator-vector)
                  (t (error "RESULT-SEQUENCE is neither a LIST or a VECTOR.")))
@@ -1395,7 +1395,7 @@ by the corresponding lowercase characters.
            (mapcar
             (lambda (seq)
               (make-instance
-                  (cond
+                  (cond
                     ((listp    seq) 'iterator-list)
                     ((vectorp* seq) 'iterator-vector)
                     (t (error "A SEQUENCE is neither a LIST or a VECTOR.")))
@@ -1717,7 +1717,7 @@ URL: http://www.informatimago.com/local/lisp/HyperSpec/Body/m_time.htm
         (time (gensym)))
     `(let* ((,start  (get-internal-real-time))
             (,result (progn ,@body))
-            (,stop   (get-internal-real-time))
+            (,stop   (get-internal-real-time))
             (,time   (- ,stop ,start)) )
        (printf *trace-output* "Time: %e ms\n" ,time))))

@@ -2112,7 +2112,7 @@ Valid clauses are:
     STRING-TRIM TAN STRING-UPCASE TANH STRING/= TENTH STRING< TERPRI
     STRING<= THE STRING= THIRD STRING> THROW STRING>= TIME STRINGP TRACE
     STRUCTURE TRANSLATE-LOGICAL-PATHNAME STRUCTURE-CLASS
-    TRANSLATE-PATHNAME STRUCTURE-OBJECT TREE-EQUAL STYLE-WARNING TRUENAME
+    TRANSLATE-PATHNAME STRUCTURE-OBJECT TREE-EQUAL STYLE-WARNING TRUENAME
     TRUNCATE VALUES-LIST TWO-WAY-STREAM VARIABLE
     TWO-WAY-STREAM-INPUT-STREAM VECTOR TWO-WAY-STREAM-OUTPUT-STREAM
     VECTOR-POP TYPE VECTOR-PUSH TYPE-ERROR VECTOR-PUSH-EXTEND
@@ -2134,4 +2134,3 @@ Valid clauses are:

 (provide 'pjb-cl)
 ;;;; THE END ;;;;
-
diff --git a/pjb-emacs.el b/pjb-emacs.el
index 5528259..9743725 100644
--- a/pjb-emacs.el
+++ b/pjb-emacs.el
@@ -2472,13 +2472,11 @@ EXCEPTIONS: either a list of pathnames that mustn't be processed,
   `(mapfiles (lambda (,file-var) ,@body) ,directory-expr ,recursive ,exceptions))

 (defun first-existing-file (list-of-files)
-  "Finds the first file in LIST-OF-FILES that exists.
-"
+  "Find the first file in LIST-OF-FILES that exists."
   (find-if (lambda (file) (and file (file-exists-p file))) list-of-files))

 (defun map-existing-files (function list-of-files)
-  "Calls FUNCTION on each file in LIST-OF-FILES that exists, and returns the list of results.
-"
+  "Call FUNCTION on each file in LIST-OF-FILES that exists, and return the list of results."
   (let ((result '()))
     (dolist (file list-of-files (nreverse result))
       (when (file-exists-p file)
@@ -2486,13 +2484,12 @@ EXCEPTIONS: either a list of pathnames that mustn't be processed,


 (defun remove-non-existing-files (list-of-files)
-  "Returns the LIST-OF-FILES with non-existing files removed.
-"
+  "Return the LIST-OF-FILES with non-existing files removed."
   (remove-if-not (function file-exists-p) list-of-files))


 (defmacro* with-file (file-and-options &body body)
-  "Processes BODY with a buffer on the given file.
+  "Process BODY with a buffer on the given file.
 DO:              find-file or find-file-literally, process body, and
                  optionally save the buffer and kill it.
                  save is not done if body exits exceptionnaly.
diff --git a/pjb-strings.el b/pjb-strings.el
index 2de8a3c..217dd88 100644
--- a/pjb-strings.el
+++ b/pjb-strings.el
@@ -9,7 +9,7 @@
 ;;;;    This module exports string utility functions.
 ;;;;
 ;;;;AUTHORS
-;;;;    <PJB> Pascal J. Bourguignon
+;;;;    <PJB> Pascal J. Bourguignon
 ;;;;MODIFICATIONS
 ;;;;    2003-01-20 <PJB> Removed string-replace for regexp-replace-in-string.
 ;;;;    2002-03-23 <PJB> Corrected string-replace: replace go on from the end
@@ -99,8 +99,8 @@ RETURN: A list of substrings of length LENGTH (but the last that may be shorter)
   (directory-namestring path))


-;;; (dolist
-;;;     (p '(
+;;; (dolist
+;;;     (p '(
 ;;;          "/" "/to" "/to/" "/to/ti" "/to/ti/" "/to/ti/ta"
 ;;;          "." "./" "./to" "./to/" "./to/ti" "./to/ti/" "./to/ti/ta"
 ;;;          "aa" "aa/" "aa/to" "aa/to/" "aa/to/ti" "aa/to/ti/" "aa/to/ti/ta"
@@ -109,22 +109,22 @@ RETURN: A list of substrings of length LENGTH (but the last that may be shorter)


 (defun string-index (string char &optional frompos)
-  "RETURN: the position in STRING of the first occurence of CHAR searching
-        FROMPOS, or from the start if FROMPOS is absent or nil.
+  "RETURN: the position in STRING of the first occurence of CHAR searching
+        FROMPOS, or from the start if FROMPOS is absent or nil.
         If CHAR is not found, then return nil.
 SEE-ALSO: string-position."
-  (string-match
-   (regexp-quote
+  (string-match
+   (regexp-quote
     (cond
       ((or (characterp char) (numberp char)) (format "%c" char))
       ((stringp char) char)
-      (t
+      (t
        (error "string-index expects a char, number of string as 2nd argument."))
       )) string frompos))


 ;;  (let ((index (cond ((null frompos) 0)
-;;                      (t (error (format
+;;                      (t (error (format
 ;;                         "Wrong type of argument: integerp, 3 (got: %S)"
 ;;                         frompos)))))
 ;;        (target (cond ((characterp char) char)
@@ -136,16 +136,16 @@ SEE-ALSO: string-position."

 (defun string-position (string substr &optional frompos)
   "Return the position in STRING of the first occurence of the SUBSTR
-searching FROMPOS, or from the start if FROMPOS is absent or nil.
+searching FROMPOS, or from the start if FROMPOS is absent or nil.
 If the SUBSTR is not found, then return nil.

 SEE-ALSO: string-index"
   (string-match (regexp-quote substr) string frompos))

 ;;  (let* (
-;;         (index
+;;         (index
 ;;          (cond ((null frompos) 0)
-;;                (t (error (format
+;;                (t (error (format
 ;;                           "Wrong type of argument: integerp, 3 (got: %S)"
 ;;                           frompos)))))
 ;;         (maxindex  (- (length string) sublen))
@@ -156,7 +156,7 @@ SEE-ALSO: string-index"
 ;;      nil)))

 (defun unsplit-string (string-list &rest separator)
-  "Does the inverse than split-string. If no separator is provided
+  "Does the inverse than split-string. If no separator is provided
 then a simple space is used."
   (if (null separator)
       (setf separator " ")
@@ -172,9 +172,9 @@ then a simple space is used."
 (defun string-repeat (num string)
   "Return a string built from the concatenation of num times string."
   (cond ((<= num 0) "")
-        ((= 0 (% num 2)) (let ((sub (string-repeat (/ num 2) string)))
+        ((= 0 (% num 2)) (let ((sub (string-repeat (/ num 2) string)))
                            (concat sub sub)))
-        (t (let ((sub (string-repeat (/ (- num 1) 2) string)))
+        (t (let ((sub (string-repeat (/ (- num 1) 2) string)))
              (concat sub sub string)))))


@@ -195,14 +195,14 @@ then a simple space is used."


 (defun string-justify-left (string &optional width left-margin)
-  "RETURN: a left-justified string built from string.
-NOTE:   The default width is 72 characters, the default left-margin is 0.
+  "RETURN: a left-justified string built from string.
+NOTE:   The default width is 72 characters, the default left-margin is 0.
         The width is counted from column 0.
         The word separators are those of split-string: [ \\f\\t\\n\\r\\v]+, which
         means that the string is justified as one paragraph."
   (if (null width) (setf width 72))
   (if (null left-margin) (setf left-margin 0))
-  (if (not (stringp string))
+  (if (not (stringp string))
       (error "string-justify-left: The first argument must be a string."))
   (if (not (and (integerp width) (integerp left-margin)))
       (error "string-justify-left: The optional arguments must be integers."))
@@ -268,7 +268,7 @@ NOTE:   The default width is 72 characters, the default left-margin is 0.
 (defun copy-to-substring (src from-src to-src dst from-dst)
   "
 PRE:     (< (+ from-dst (- to-src from-src)) (length dst))
-DO:      Copy characters of string src between `from-src' and `to-src' to
+DO:      Copy characters of string src between `from-src' and `to-src' to
          the string dst between `from-dst' and `from-dst'+`to-src'-`from-src'.
 RETURN:  dst
 "
@@ -286,7 +286,7 @@ RETURN: A padded string.
   (let ((slen (length string)))
     (if (<= length slen)
         string
-        (when (stringp padchar)
+        (when (stringp padchar)
           (setf padchar (string-to-char padchar)))
         (ecase justification
           ((:right)  (concat string
@@ -314,12 +314,12 @@ RETURN: A padded string.



-(defun* chop (string &key (characters (list (character " "))))
+(defun* chop (string &key (characters (list (character " "))))
   "
 RETURN: A substring of string from which the characters in the set  of
         :characters (only space by default) are removed from left and
         right (or only from left when :only-left is specified, or only
-        from right when :only-right is specified.
+        from right when :only-right is specified.
 NOTE:   The argument passed with :characters can be a list of characters
         or a string.
 "
@@ -347,8 +347,8 @@ NOTE:   The argument passed with :characters can be a list of characters
   "RETURNS: a substring of STRING with the prefix and postfix spaces removed."
   (save-match-data
     (let ((chopped " \t\n"))
-      (if (string-match
-           (format "^[%s]*\\([^%s].*[^%s]\\|[^%s]\\)[%s]*$"
+      (if (string-match
+           (format "^[%s]*\\([^%s].*[^%s]\\|[^%s]\\)[%s]*$"
              chopped chopped chopped chopped chopped) string)
           (match-string 1 string)
           string))))
@@ -384,16 +384,16 @@ NOTE:   The argument passed with :characters can be a list of characters
   "
 RETURN: If prefix is a prefix of string then the substring following it
         else nil.
-OPTIONS can contain :ignore-case in which case the case string and prefix
+OPTIONS can contain :ignore-case in which case the case string and prefix
         are matched case insensitively.
 "
   (if (or (null string) (null prefix))
       nil
       (let ((mstring string))
-        (if (member :ignore-case options)
+        (if (member :ignore-case options)
             (setf mstring (upcase string)
                   prefix  (upcase prefix)))
-
+
         (if (and (<= (length prefix) (length mstring))
                  (string-equal prefix (substring mstring 0 (length prefix))))
             (substring string (length prefix))
@@ -403,22 +403,22 @@ OPTIONS can contain :ignore-case in which case the case string and prefix



-(defvar iso-latin-1-approximation nil
+(defvar iso-latin-1-approximation nil
   "An array mapping ISO-8859-1 characters to ASCII-characters")


 (defun make-iso-latin-1-approximation ()
   (setf iso-latin-1-approximation (make-vector 256 0))
-  (loop for i from 0 to 127
+  (loop for i from 0 to 127
      do (aset iso-latin-1-approximation i i))
-  (loop for i from 128 below 160
-     for c from 0 below 32
+  (loop for i from 128 below 160
+     for c from 0 below 32
      do (aset iso-latin-1-approximation i c))
   (loop for i from 160 to 255
      for c across (concat " !cL$Y|S\"Ca<--R\"o~23'uP.,1o>***?"
                           "AAAAAAECEEEEIIIITNOOOOOxOUUUUYPs"
                           "aaaaaaeceeeeiiiitnooooo/ouuuuypy")
-     do (aset iso-latin-1-approximation i c))
+     do (aset iso-latin-1-approximation i c))
   iso-latin-1-approximation)


@@ -429,12 +429,12 @@ RETURN: modified string
 DO:     replace in string all accented characters with an unaccented version.
         This is done only for ISO-5581-1 characters.
 "
-  (unless iso-latin-1-approximation
+  (unless iso-latin-1-approximation
     (make-iso-latin-1-approximation))
   (let ((result (make-string (length string) 0)))
     (loop for p from 0 below (length string)
-       do
-       (aset result p (aref iso-latin-1-approximation
+       do
+       (aset result p (aref iso-latin-1-approximation
                             (% (aref string p) 256))))
     result))

@@ -444,7 +444,7 @@ DO:     replace in string all accented characters with an unaccented version.
      (unless (and (boundp (quote ,table)) ,table)
        (setf ,table (make-vector 7 0)))
      (put (intern ,string ,table)
-          ,language
+          ,language
           (if (eq ,translated-string :idem) ,string ,translated-string))))


@@ -453,9 +453,9 @@ DO:     replace in string all accented characters with an unaccented version.
 RETURN: A version of the string in the given language.
 "
   (let ((sym (intern-soft string table)))
-    (if sym
-        (let ((result (get sym language)))
-          (if result
+    (if sym
+        (let ((result (get sym language)))
+          (if result
               result
               (localize table :en string)))
         string)))
diff --git a/pjb-work.el b/pjb-work.el
index 40a4670..ad48d46 100644
--- a/pjb-work.el
+++ b/pjb-work.el
@@ -6,11 +6,11 @@
 ;;;;USER-INTERFACE:     emacs
 ;;;;DESCRIPTION
 ;;;;
-;;;;    This module exports function to insert timestamps when
+;;;;    This module exports function to insert timestamps when
 ;;;;    starting and stoping work, and updating total lines.
 ;;;;
 ;;;;AUTHORS
-;;;;    <PJB> Pascal J. Bourguignon
+;;;;    <PJB> Pascal J. Bourguignon
 ;;;;MODIFICATIONS
 ;;;;    199?-??-?? <PJB> Creation.
 ;;;;BUGS
@@ -38,7 +38,7 @@
 (require 'pjb-cl)
 (provide 'pjb-work)

-(defun duree (a b)
+(defun duree (a b)
   (let ((da (dms-d a)) (db (dms-d b)))
     (d-dms (+ (if (<= da db) 0 24) (- db da)))))

@@ -86,7 +86,7 @@ found backward from the point."
   (interactive)
   (search-backward-regexp  *pjb-work-duration-regexp*)
   (let ((mat (match-data))
-        (duration (duree (match-string-no-properties 1)
+        (duration (duree (match-string-no-properties 1)
                          (match-string-no-properties 2))))
     (store-match-data mat)
     (replace-match (format " ; %s" (if (< (length duration) 8)
@@ -129,7 +129,7 @@ found backward from the point."
             p (cdr p)))
     ;; build the total string.
     (setq amount (* total hourly-rate))
-    (setq totalstring
+    (setq totalstring
           (concat
            (format " Total %30s %10s = %5.2f j   (%6.2f h)\n" "" (d-dms total) (/ total 8.0) total)
            (format " Facturation %34s %8.2f EUR HT\n" "" amount)
@@ -150,7 +150,7 @@ found backward from the point."
   "
 RETURN:  The file name formated from the firm, project and date.
 "
-  (format "%s/firms/%s/interventions/%s-%s.txt"
+  (format "%s/firms/%s/interventions/%s-%s.txt"
     (getenv "HOME") firm date  project))


@@ -160,7 +160,7 @@ RETURN: A list of the names of the directories directly in ~/firms/
         that have an intervention subdirectory that is accessible.
         (We skip names beginning with an underline or ending with a tilde).
 "
-  (mapcan
+  (mapcan
    (lambda (path)
      (when (and (file-directory-p path)
                 (not (string-match ".*/_[^/]*$\\|~$" path))
@@ -173,32 +173,32 @@ RETURN: A list of the names of the directories directly in ~/firms/

 (defun get-project-list (firm)
   "
-RETURN: A list of the names of projects initiated for the FIRM.
-        It is determined from the name of the files in the interventions
+RETURN: A list of the names of projects initiated for the FIRM.
+        It is determined from the name of the files in the interventions
         subdirectory of the firm.
 "
   (delete-duplicates
    (mapcan
     (lambda (path)
-      (when (string-match
+      (when (string-match
              ".*/\\([0-9][0-9][0-9][0-9][0-9]*\\)-\\([^-/][^-/]*\\).txt$" path)
         (list (match-string 2 path))))
-    (file-expand-wildcards
+    (file-expand-wildcards
      (format "%s/firms/%s/interventions/[0-9]*-*.txt" (getenv "HOME") firm) t))
    :test (function cl:string=)))


 (defun find-last-intervention (firm project)
-  (car
-   (sort
+  (car
+   (sort
     (delete-duplicates
-     (mapcan
+     (mapcan
       (lambda (path)
         (when (string-match
                ".*/\\([0-9][0-9][0-9][0-9][0-9]*\\)-\\([^-/][^-/]*\\).txt$" path)
           (list (match-string 1 path))))
-      (file-expand-wildcards
-       (format "%s/firms/%s/interventions/[0-9]*-%s.txt"
+      (file-expand-wildcards
+       (format "%s/firms/%s/interventions/[0-9]*-%s.txt"
          (getenv "HOME") firm project) t)))
     (function cl:string>=))))

@@ -207,14 +207,14 @@ RETURN: A list of the names of projects initiated for the FIRM.

 (defun pjb-intervention (firm project)
   (interactive
-   (list
+   (list
     ;; firms
-    (completing-read
+    (completing-read
      "Firm: " (mapcar (lambda (x) (cons x nil)) (get-firm-list))
      (lambda (firm) (setq *pjb-intervention-firm* (car firm)))  t)
     ;; projects:
     (completing-read
-     "Project: " (mapcar (lambda (x) (cons x nil))
+     "Project: " (mapcar (lambda (x) (cons x nil))
                          (get-project-list *pjb-intervention-firm*))
      (function identity) nil)))
   (let ((date)
@@ -246,9 +246,9 @@ RETURN: A list of the names of projects initiated for the FIRM.
                 (search-forward-regexp " Total.*\n Facturation.*" nil t))
          (beginning-of-line)
          (if (search-backward "===="
-                              (save-excursion (forward-line -5) (point)) t)
+                              (save-excursion (forward-line -5) (point)) t)
              (progn (beginning-of-line) (open-line 2))
-             (progn (forward-line -1) (open-line 1)
+             (progn (forward-line -1) (open-line 1)
                     (insert footer)
                     (beginning-of-line) (open-line 2))))
         ((progn (goto-char (point-min))
@@ -269,7 +269,7 @@ RETURN: A list of the names of projects initiated for the FIRM.
 ;; (defvar *inactivity-timer*       nil)
 ;; (defvar *slice-activity-timer*   nil)

-;; (defvar *command-count*          0)
+;; (defvar *command-count*          0)

 (defvar *current-command*       nil)
 (defvar *hostname*
@@ -292,7 +292,7 @@ RETURN: A list of the names of projects initiated for the FIRM.
   client
   project
   annotation)
-
+

 (defun activity-send-message (message)
   (message "%S" message))
@@ -342,14 +342,14 @@ RETURN: A list of the names of projects initiated for the FIRM.

 (defun activity-switch (client project)
   (interactive
-   (list
+   (list
     ;; firms
-    (completing-read
+    (completing-read
      "Firm: " (mapcar (lambda (x) (cons x nil)) (get-firm-list))
      (lambda (firm) (setq *pjb-intervention-firm* (car firm)))  t)
     ;; projects:
     (completing-read
-     "Project: " (mapcar (lambda (x) (cons x nil))
+     "Project: " (mapcar (lambda (x) (cons x nil))
                          (get-project-list *pjb-intervention-firm*))
      (function identity) nil)))
   (activity-enqueue-event (make-activity :event 'switch :client client :project project))
@@ -412,7 +412,7 @@ RETURN: A list of the names of projects initiated for the FIRM.
 ;;   (when *slice-activity-timer*
 ;;     (cancel-timer *slice-activity-timer*))
 ;;   (setf *slice-activity-timer* (run-with-timer 60 60 'activity-slice)))
-;;
+;;
 ;; (defun activity-remove-timers ()
 ;; ;;   (when *start-inactivity-timer*
 ;; ;;     (cancel-timer *start-inactivity-timer*)
@@ -430,11 +430,11 @@ RETURN: A list of the names of projects initiated for the FIRM.

 ;; activity-switch         (client project &optional annotation)
 ;; activity-add-annotation (annotation)
-;;
+;;
 ;; each minute
 ;; count the number of commands
 ;; see if the minute is idle
-;;
+;;
 ;; collect lav too...

ViewGit